Skip to content

Commit 8d0c9ca

Browse files
committed
Revert "Change into builddir when extracting multiple sources"
This reverts commit eb07c72.
1 parent eb07c72 commit 8d0c9ca

File tree

1 file changed

+3
-7
lines changed

1 file changed

+3
-7
lines changed

easybuild/framework/easyblock.py

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2852,19 +2852,15 @@ def extract_step(self):
28522852
"""
28532853
Unpack the source files.
28542854
"""
2855-
for i, src in enumerate(self.src):
2855+
for src in self.src:
28562856
self.log.info("Unpacking source %s" % src['name'])
28572857
srcdir = extract_file(src['path'], self.builddir, cmd=src['cmd'],
2858-
extra_options=self.cfg['unpack_options'], change_into_dir=(i == 0))
2858+
extra_options=self.cfg['unpack_options'], change_into_dir=False)
2859+
change_dir(srcdir)
28592860
if srcdir:
28602861
self.src[self.src.index(src)]['finalpath'] = srcdir
28612862
else:
28622863
raise EasyBuildError("Unpacking source %s failed", src['name'])
2863-
# Compatibility with previous EasyBuild versions:
2864-
# When multiple sources were extracted subsequent calls of `extract_file` returned the build directory
2865-
# so we changed to that instead of the directory of the first/main source
2866-
if len(src) > 1:
2867-
change_dir(self.builddir)
28682864

28692865
def patch_step(self, beginpath=None, patches=None):
28702866
"""

0 commit comments

Comments
 (0)