zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More helpful error when patch lookup fails (#40379)

Browse Source
This commit is contained in:
Harmen Stoppels 2023-10-10 21:09:04 +02:00 committed by GitHub
parent 620835e30c
commit 390b0aa25c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/spack/spack/patch.py
View File

@ -312,21 +312,19 @@ def from_json(cls, stream, repository):
def to_json(self, stream): def to_json(self, stream):
sjson.dump({"patches": self.index}, stream) sjson.dump({"patches": self.index}, stream)
def patch_for_package(self, sha256, pkg): def patch_for_package(self, sha256: str, pkg):
"""Look up a patch in the index and build a patch object for it. """Look up a patch in the index and build a patch object for it.
Arguments: Arguments:
sha256 (str): sha256 hash to look up sha256: sha256 hash to look up
pkg (spack.package_base.PackageBase): Package object to get patch for. pkg (spack.package_base.PackageBase): Package object to get patch for.
We build patch objects lazily because building them requires that We build patch objects lazily because building them requires that
we have information about the package's location in its repo. we have information about the package's location in its repo."""
"""
sha_index = self.index.get(sha256) sha_index = self.index.get(sha256)
if not sha_index: if not sha_index:
raise NoSuchPatchError( raise PatchLookupError(
"Couldn't find patch for package %s with sha256: %s" % (pkg.fullname, sha256) f"Couldn't find patch for package {pkg.fullname} with sha256: {sha256}"
) )
# Find patches for this class or any class it inherits from # Find patches for this class or any class it inherits from
@ -335,8 +333,8 @@ def patch_for_package(self, sha256, pkg):
if patch_dict: if patch_dict:
break break
else: else:
raise NoSuchPatchError( raise PatchLookupError(
"Couldn't find patch for package %s with sha256: %s" % (pkg.fullname, sha256) f"Couldn't find patch for package {pkg.fullname} with sha256: {sha256}"
) )
# add the sha256 back (we take it out on write to save space, # add the sha256 back (we take it out on write to save space,
@ -405,5 +403,9 @@ class NoSuchPatchError(spack.error.SpackError):
"""Raised when a patch file doesn't exist.""" """Raised when a patch file doesn't exist."""
class PatchLookupError(NoSuchPatchError):
"""Raised when a patch file cannot be located from sha256."""
class PatchDirectiveError(spack.error.SpackError): class PatchDirectiveError(spack.error.SpackError):
"""Raised when the wrong arguments are suppled to the patch directive.""" """Raised when the wrong arguments are suppled to the patch directive."""

9
lib/spack/spack/spec.py
View File

@ -74,6 +74,7 @@
import spack.deptypes as dt import spack.deptypes as dt
import spack.error import spack.error
import spack.hash_types as ht import spack.hash_types as ht
import spack.patch
import spack.paths import spack.paths
import spack.platforms import spack.platforms
import spack.provider_index import spack.provider_index
@ -3906,7 +3907,15 @@ def patches(self):
for sha256 in self.variants["patches"]._patches_in_order_of_appearance: for sha256 in self.variants["patches"]._patches_in_order_of_appearance:
index = spack.repo.PATH.patch_index index = spack.repo.PATH.patch_index
pkg_cls = spack.repo.PATH.get_pkg_class(self.name) pkg_cls = spack.repo.PATH.get_pkg_class(self.name)
try:
patch = index.patch_for_package(sha256, pkg_cls) patch = index.patch_for_package(sha256, pkg_cls)
except spack.patch.PatchLookupError as e:
raise spack.error.SpecError(
f"{e}. This usually means the patch was modified or removed. "
"To fix this, either reconcretize or use the original package "
"repository"
) from e
self._patches.append(patch) self._patches.append(patch)
return self._patches return self._patches