revert unnecessary changes to patch_step, not needed to call patch_step from ExtensionEasyBlock.run

Author: boegel

easybuild/framework/easyblock.py

@@ -1878,27 +1878,25 @@ def extract_step(self):
             else:
                 raise EasyBuildError("Unpacking source %s failed", src['name'])
 
-    def patch_step(self, beginpath=None, extension=False):
+    def patch_step(self, beginpath=None):
         """
         Apply the patches
         """
         for patch in self.patches:
             self.log.info("Applying patch %s" % patch['name'])
             trace_msg("applying patch %s" % patch['name'])
 
-            if not extension:
-                # patch source at specified index (first source if not specified)
-                srcind = patch.get('source', 0)
+            # patch source at specified index (first source if not specified)
+            srcind = patch.get('source', 0)
             # if patch level is specified, use that (otherwise let apply_patch derive patch level)
             level = patch.get('level', None)
             # determine suffix of source path to apply patch in (if any)
             srcpathsuffix = patch.get('sourcepath', patch.get('copy', ''))
             # determine whether 'patch' file should be copied rather than applied
             copy_patch = 'copy' in patch and 'sourcepath' not in patch
 
-            if not extension:
-                self.log.debug("Source index: %s; patch level: %s; source path suffix: %s; copy patch: %s",
-                               srcind, level, srcpathsuffix, copy)
+            self.log.debug("Source index: %s; patch level: %s; source path suffix: %s; copy patch: %s",
+                            srcind, level, srcpathsuffix, copy)
 
             if beginpath is None:
                 try:

easybuild/framework/extensioneasyblock.py

@@ -110,7 +110,7 @@ def run(self, unpack_src=False):
                 change_dir(self.start_dir)
 
         # patch if needed
-        EasyBlock.patch_step(self, beginpath=self.ext_dir, extension=True)
+        EasyBlock.patch_step(self, beginpath=self.ext_dir)
 
     def sanity_check_step(self, exts_filter=None, custom_paths=None, custom_commands=None):
         """