Merge pull request #3981 from boegel/fix_donwload_instructions

also print download instructions for extensions that use source_tmpl to specify name of source file

Author: bartoldeman

easybuild/framework/easyblock.py

@@ -556,6 +556,8 @@ def collect_exts_file_info(self, fetch_files=True, verify_checksums=True):
                     source_urls = ext_options.get('source_urls', [])
                     checksums = ext_options.get('checksums', [])
 
+                    download_instructions = ext_options.get('download_instructions')
+
                     if ext_options.get('nosource', None):
                         self.log.debug("No sources for extension %s, as indicated by 'nosource'", ext_name)
 
@@ -588,7 +590,7 @@ def collect_exts_file_info(self, fetch_files=True, verify_checksums=True):
 
                         if fetch_files:
                             src = self.fetch_source(source, checksums, extension=True,
-                                                    download_instructions=ext_options.get('download_instructions'))
+                                                    download_instructions=download_instructions)
                             ext_src.update({
                                 # keep track of custom extract command (if any)
                                 'extract_cmd': src['cmd'],
@@ -610,7 +612,8 @@ def collect_exts_file_info(self, fetch_files=True, verify_checksums=True):
 
                         if fetch_files:
                             src_path = self.obtain_file(src_fn, extension=True, urls=source_urls,
-                                                        force_download=force_download)
+                                                        force_download=force_download,
+                                                        download_instructions=download_instructions)
                             if src_path:
                                 ext_src.update({'src': src_path})
                             else:

test/framework/easyblock.py

@@ -1570,6 +1570,21 @@ def test_download_instructions(self):
         self.assertEqual(stderr, "Download instructions:\n\nExtension sources must be downloaded via example.com")
         self.assertEqual(stdout, '')
 
+        # download instructions should also be printed if 'source_tmpl' is used to specify extension sources
+        self.contents = self.contents.replace(sources, "'source_tmpl': SOURCE_TAR_GZ,")
+        self.writeEC()
+        eb = EasyBlock(EasyConfig(self.eb_file))
+
+        self.mock_stderr(True)
+        self.mock_stdout(True)
+        self.assertErrorRegex(EasyBuildError, error_pattern, eb.fetch_step)
+        stderr = self.get_stderr().strip()
+        stdout = self.get_stdout().strip()
+        self.mock_stderr(False)
+        self.mock_stdout(False)
+        self.assertEqual(stderr, "Download instructions:\n\nExtension sources must be downloaded via example.com")
+        self.assertEqual(stdout, '')
+
         # create dummy source file for extension
         write_file(os.path.join(os.path.dirname(self.eb_file), 'ext_with_missing_sources-0.0.tar.gz'), '')