Merge pull request #4960 from bedroge/copy_patches_fix

store all patches (incl the ones for extensions) that need to be copied to a repo/reprod dir in an `all_patches` set

Author: ocaisa

easybuild/base/frozendict.py

@@ -52,7 +52,7 @@ def __repr__(self):
 
     def __hash__(self):
         if self.__hash is None:
-            self.__hash = reduce(operator.xor, map(hash, self.iteritems()), 0)
+            self.__hash = reduce(operator.xor, map(hash, self.items()), 0)
 
         return self.__hash
 

easybuild/framework/easyblock.py

@@ -188,6 +188,7 @@ def __init__(self, ec, logfile=None):
 
         # list of patch/source files, along with checksums
         self.patches = []
+        self.all_patches_paths = set()  # set of paths to all patches (including patches of extensions)
         self.src = []
         self.data_src = []
         self.checksums = []
@@ -601,6 +602,7 @@ def fetch_patches(self, patch_specs=None, extension=False, checksums=None):
                 patch_info['path'] = path
                 patch_info['checksum'] = self.get_checksum_for(checksums, filename=patch_info['name'], index=index)
 
+                self.all_patches_paths.add(path)
                 if extension:
                     patches.append(patch_info)
                 else:
@@ -5126,12 +5128,8 @@ def ensure_writable_log_dir(log_dir):
                     block = det_full_ec_version(app.cfg) + ".block"
                     repo.add_easyconfig(ecdict['original_spec'], app.name, block, buildstats, currentbuildstats)
                 repo.add_easyconfig(spec, app.name, det_full_ec_version(app.cfg), buildstats, currentbuildstats)
-                patches = app.patches
-                for ext in app.exts:
-                    patches += ext.get('patches', [])
-                for patch in patches:
-                    if 'path' in patch:
-                        repo.add_patch(patch['path'], app.name)
+                for patch_path in app.all_patches_paths:
+                    repo.add_patch(patch_path, app.name)
                 repo.commit("Built %s" % app.full_mod_name)
                 del repo
             except EasyBuildError as err:
@@ -5153,14 +5151,10 @@ def ensure_writable_log_dir(log_dir):
                 _log.debug("Copied easyconfig file %s to %s", spec, newspec)
 
                 # copy patches
-                patches = app.patches
-                for ext in app.exts:
-                    patches += ext.get('patches', [])
-                for patch in patches:
-                    if 'path' in patch:
-                        target = os.path.join(new_log_dir, os.path.basename(patch['path']))
-                        copy_file(patch['path'], target)
-                        _log.debug("Copied patch %s to %s", patch['path'], target)
+                for patch_path in app.all_patches_paths:
+                    target = os.path.join(new_log_dir, os.path.basename(patch_path))
+                    copy_file(patch_path, target)
+                    _log.debug("Copied patch %s to %s", patch_path, target)
 
                 if build_option('read_only_installdir') and not app.cfg['stop']:
                     # take away user write permissions (again)