checksum tuple value may also be (<checksum type>, <checksum value>)

Author: boegel

easybuild/framework/easyblock.py

@@ -1830,7 +1830,7 @@ def checksum_step(self):
 
     def check_checksums_for(self, ent, sub='', source_cnt=None):
         """
-        Utility method: check whether checksums for all sources/patches are available, for given entity
+        Utility method: check whether SHA256 checksums for all sources/patches are available, for given entity
         """
         ec_fn = os.path.basename(self.cfg.path)
         checksum_issues = []
@@ -1857,10 +1857,14 @@ def check_checksums_for(self, ent, sub='', source_cnt=None):
             if isinstance(checksum, dict):
                 checksum = checksum.get(fn)
 
-            # take into account that we may encounter a tuuple of valid checksums
+            # take into account that we may encounter a tuple of valid SHA256 checksums
             # (see https://github.com/easybuilders/easybuild-framework/pull/2958)
             if isinstance(checksum, tuple):
-                valid_checksums = checksum
+                # 1st tuple item may indicate checksum type, must be SHA256 or else it's blatently ignored here
+                if len(checksum) == 2 and checksum[0] == CHECKSUM_TYPE_SHA256:
+                    valid_checksums = (checksum[1],)
+                else:
+                    valid_checksums = checksum
             else:
                 valid_checksums = (checksum,)
 

test/framework/easyblock.py

@@ -1723,6 +1723,15 @@ def run_checks():
         # no checksum issues
         self.assertEqual(eb.check_checksums(), [])
 
+        # SHA256 checksum with type specifier: OK
+        eb.cfg['checksums'] = [
+            ('sha256', '44332000aa33b99ad1e00cbd1a7da769220d74647060a10e807b916d73ea27bc'),  # toy-0.0.tar.gz
+            '45b5e3f9f495366830e1869bb2b8f4e7c28022739ce48d9f9ebb159b439823c5',  # toy-*.patch
+            ('sha256', '4196b56771140d8e2468fb77f0240bc48ddbf5dabafe0713d612df7fafb1e458'),  # toy-extra.txt]
+        ]
+        # no checksum issues
+        self.assertEqual(eb.check_checksums(), [])
+
         # tuple of two alternate SHA256 checksums: OK
         eb.cfg['checksums'] = [
             (