Merge pull request #4093 from akesandgren/fix-obtain_files-for-patch-with-alt_location

first look for patch in alt_location when it is specified

Author: boegel

easybuild/framework/easyblock.py

@@ -753,8 +753,15 @@ def obtain_file(self, filename, extension=False, urls=None, download_filename=No
             foundfile = None
             failedpaths = []
 
-            # always look first in the dir of the current eb file
-            ebpath = [os.path.dirname(self.cfg.path)]
+            # always look first in the dir of the current eb file unless alt_location is set
+            if alt_location is None:
+                ebpath = [os.path.dirname(self.cfg.path)]
+                self.log.info("Considering directory in which easyconfig file is located when searching for %s: %s",
+                              filename, ebpath[0])
+            else:
+                ebpath = []
+                self.log.info("Not considering directory in which easyconfig file is located when searching for %s "
+                              "because alt_location is set to %s", filename, alt_location)
 
             # always consider robot + easyconfigs install paths as a fall back (e.g. for patch files, test cases, ...)
             common_filepaths = []

test/framework/easyblock.py

@@ -1684,7 +1684,11 @@ def test_obtain_file(self):
         mkdir(tmpdir_subdir, parents=True)
         del os.environ['EASYBUILD_SOURCEPATH']  # defined by setUp
 
-        ec = process_easyconfig(os.path.join(testdir, 'easyconfigs', 'test_ecs', 't', 'toy', 'toy-0.0.eb'))[0]
+        toy_ec = os.path.join(testdir, 'easyconfigs', 'test_ecs', 't', 'toy', 'toy-0.0.eb')
+        test_ec = os.path.join(tmpdir, 'ecs', 'test.eb')
+        copy_file(toy_ec, test_ec)
+
+        ec = process_easyconfig(test_ec)[0]
         eb = EasyBlock(ec['ec'])
 
         # 'downloading' a file to (first) sourcepath works
@@ -1697,6 +1701,15 @@ def test_obtain_file(self):
         res = eb.obtain_file(toy_tarball, urls=['file://%s' % tmpdir_subdir], alt_location='alt_toy')
         self.assertEqual(res, os.path.join(tmpdir, 'a', 'alt_toy', toy_tarball))
 
+        # make sure that directory in which easyconfig file is located is *ignored* when alt_location is used
+        dummy_toy_tar_gz = os.path.join(os.path.dirname(test_ec), 'toy-0.0.tar.gz')
+        write_file(dummy_toy_tar_gz, '')
+        res = eb.obtain_file(toy_tarball, urls=['file://%s' % tmpdir_subdir])
+        self.assertEqual(res, dummy_toy_tar_gz)
+        res = eb.obtain_file(toy_tarball, urls=['file://%s' % tmpdir_subdir], alt_location='alt_toy')
+        self.assertEqual(res, os.path.join(tmpdir, 'a', 'alt_toy', toy_tarball))
+        remove_file(dummy_toy_tar_gz)
+
         # finding a file in sourcepath works
         init_config(args=["--sourcepath=%s:/no/such/dir:%s" % (sandbox_sources, tmpdir)])
         res = eb.obtain_file(toy_tarball)