Merge pull request #4005 from Louwrensth/fixup_tweak_printing_of_download_instructions

fix printing of list of attempted download URLs when url-encoded characters are used in URL

Author: boegel

easybuild/framework/easyblock.py

@@ -883,8 +883,10 @@ def obtain_file(self, filename, extension=False, urls=None, download_filename=No
                         error_msg += "please follow the download instructions above, and make the file available "
                         error_msg += "in the active source path (%s)" % ':'.join(source_paths())
                     else:
+                        # flatten list to string with '%' characters escaped (literal '%' desired in 'sprintf')
+                        failedpaths_msg = ', '.join(failedpaths).replace('%', '%%')
                         error_msg += "and downloading it didn't work either... "
-                        error_msg += "Paths attempted (in order): %s " % ', '.join(failedpaths)
+                        error_msg += "Paths attempted (in order): %s " % failedpaths_msg
 
                     raise EasyBuildError(error_msg, filename)
 

test/framework/easyblock.py

@@ -1694,6 +1694,12 @@ def test_obtain_file(self):
         error_regex = "Couldn't find file %s anywhere, and downloading it didn't work either" % fn
         self.assertErrorRegex(EasyBuildError, error_regex, eb.obtain_file, fn, urls=['file://%s' % tmpdir_subdir])
 
+        # also test triggering error when downloading from a URL that includes URL-encoded characters
+        # cfr. https://github.com/easybuilders/easybuild-framework/pull/4005
+        url = 'file://%s' % os.path.dirname(tmpdir_subdir)
+        url += '%2F' + os.path.basename(tmpdir_subdir)
+        self.assertErrorRegex(EasyBuildError, error_regex, eb.obtain_file, fn, urls=[url])
+
         # file specifications via URL also work, are downloaded to (first) sourcepath
         init_config(args=["--sourcepath=%s:/no/such/dir:%s" % (tmpdir, sandbox_sources)])
         urls = [