allow different patches with the same name as long as they are for different package versions; note that dependency patches currently must have different names

scheibelp · scheibelp · commit 8108bece57dc · 2019-11-06T15:53:28.000-08:00
diff --git a/lib/spack/spack/mirror.py b/lib/spack/spack/mirror.py
@@ -504,8 +504,8 @@ def add_single_spec(spec, mirror_root, mirror_stats):
         try:
             with spec.package.stage as pkg_stage:
                 pkg_stage.cache_mirror(mirror_stats)
-                for patch in spec.package.all_patches():
-                    patch.fetch(pkg_stage)
+                for patch in spec.package.patches_for_spec(spec):
+                    patch.fetch(spec.version)
                     if patch.cache():
                         patch.cache().cache_mirror(mirror_stats)
                     patch.clean()
diff --git a/lib/spack/spack/package.py b/lib/spack/spack/package.py
@@ -1202,15 +1202,16 @@ def do_patch(self):
             touch(no_patches_file)
 
     @classmethod
-    def all_patches(cls):
+    def patches_for_spec(cls, spec):
         """Retrieve all patches associated with the package.
 
         Retrieves patches on the package itself as well as patches on the
         dependencies of the package."""
         patches = []
-        for _, patch_list in cls.patches.items():
-            for patch in patch_list:
-                patches.append(patch)
+        for when_spec, patch_list in cls.patches.items():
+            if spec.satisfies(when_spec):
+                for patch in patch_list:
+                    patches.append(patch)
 
         pkg_deps = cls.dependencies
         for dep_name in pkg_deps:
diff --git a/lib/spack/spack/patch.py b/lib/spack/spack/patch.py
@@ -184,8 +184,7 @@ def __init__(self, pkg, url, level=1, working_dir='.', ordering_key=None,
         if not self.sha256:
             raise PatchDirectiveError("URL patches require a sha256 checksum")
 
-    # TODO: this function doesn't use the stage arg
-    def fetch(self, stage):
+    def fetch(self, version):
         """Retrieve the patch in a temporary stage and compute self.path
 
         Args:
@@ -200,7 +199,8 @@ def fetch(self, stage):
                                       expand=bool(self.archive_sha256))
 
         per_package_ref = os.path.join(
-            self.owner.split('.')[-1], os.path.basename(self.url))
+            self.owner.split('.')[-1],
+            "{0}-{1}".format(os.path.basename(self.url), str(version)))
         # Reference starting with "spack." is required to avoid cyclic imports
         mirror_ref = spack.mirror.mirror_archive_paths(
             fetcher, per_package_ref)
diff --git a/lib/spack/spack/test/patch.py b/lib/spack/spack/test/patch.py
@@ -61,8 +61,6 @@ def test_url_patch(mock_patch_stage, filename, sha256, archive_sha256):
 
     # make a stage
     with Stage(url) as stage:  # TODO: url isn't used; maybe refactor Stage
-        stage.mirror_path = mock_patch_stage
-
         mkdirp(stage.source_path)
         with working_dir(stage.source_path):
             # write a file to be patched
@@ -79,7 +77,7 @@ def test_url_patch(mock_patch_stage, filename, sha256, archive_sha256):
 third line
 """)
         # apply the patch and compare files
-        patch.fetch(stage)
+        patch.fetch('1.0')
         patch.apply(stage)
         patch.clean()
 
