Merge pull request #4806 from Flamefire/nosource-checksum-fix

Fix `check_checksums` when `nosource: True` is used.

Author: jfgrimm

easybuild/framework/easyblock.py

@@ -2783,7 +2783,8 @@ def check_checksums(self):
                 # take into account that extension may be a 2-tuple with just name/version
                 ext_opts = ext[2] if len(ext) == 3 else {}
                 # only a single source per extension is supported (see source_tmpl)
-                res = self.check_checksums_for(ext_opts, sub="of extension %s" % ext_name, source_cnt=1)
+                source_cnt = 1 if not ext_opts.get('nosource') else 0
+                res = self.check_checksums_for(ext_opts, sub="of extension %s" % ext_name, source_cnt=source_cnt)
                 checksum_issues.extend(res)
 
         return checksum_issues

test/framework/easyconfig.py

@@ -4197,10 +4197,10 @@ def test_check_sha256_checksums(self):
         # re-test with right checksum in place
         toy_sha256 = '44332000aa33b99ad1e00cbd1a7da769220d74647060a10e807b916d73ea27bc'
         test_ec_txt = checksums_regex.sub('checksums = ["%s"]' % toy_sha256, toy_ec_txt)
-        test_ec_txt = re.sub(r'patches = \[(.|\n)*\]', '', test_ec_txt)
+        passing_test_ec_txt = re.sub(r'patches = \[(.|\n)*\]', '', test_ec_txt)
 
         test_ec = os.path.join(self.test_prefix, 'toy-0.0-ok.eb')
-        write_file(test_ec, test_ec_txt)
+        write_file(test_ec, passing_test_ec_txt)
         ecs, _ = parse_easyconfigs([(test_ec, False)])
         ecs = [ec['ec'] for ec in ecs]
 
@@ -4236,6 +4236,15 @@ def test_check_sha256_checksums(self):
         regex = re.compile(r"Non-SHA256 checksum\(s\) found for toy-0.0.tar.gz:.*not_really_a_sha256_checksum")
         self.assertTrue(regex.match(res[0]), "Pattern '%s' found in: %s" % (regex.pattern, res[0]))
 
+        # Extension with nosource: True
+        test_ec_txt = passing_test_ec_txt + "exts_list = [('bar', '0.0', { 'nosource': True })]"
+        toy_sha256 = '44332000aa33b99ad1e00cbd1a7da769220d74647060a10e807b916d73ea27bc'
+        test_ec = os.path.join(self.test_prefix, 'toy-0.0-nosource.eb')
+        write_file(test_ec, test_ec_txt)
+        ecs, _ = parse_easyconfigs([(test_ec, False)])
+        ecs = [ec['ec'] for ec in ecs]
+        self.assertEqual(check_sha256_checksums(ecs), [])
+
     def test_deprecated(self):
         """Test use of 'deprecated' easyconfig parameter."""
         topdir = os.path.dirname(os.path.abspath(__file__))