fix patched dependencies across repositories #42463
Conversation
|
Just want to say that this fixes an important issue for me. |
tgamblin
force-pushed
the
bugfix/patches-across-repos
branch
from
5f93a75 to
a00d6b2
Compare
tgamblin
force-pushed
the
bugfix/patches-across-repos
branch
from
a00d6b2 to
fa5b6ad
Compare
spackbot-app
bot
added
dependencies
new-version
tests
|
@alalazo see if you like the test here. I do not see a good way to do this without using |
tgamblin
force-pushed
the
bugfix/patches-across-repos
branch
from
7469aec to
7ddf20d
Compare
Signed-off-by: Todd Gamblin <tgamblin@llnl.gov>
tgamblin
force-pushed
the
bugfix/patches-across-repos
branch
from
7ddf20d to
2e6760c
Compare
tgamblin
dismissed
alalazo’s stale review
Greg and I reviewed each other's changes and this is addressed.
| @@ -530,7 +530,7 @@ def update_package(self, pkg_fullname: str) -> None: | |||
|
|
|||
| # update the index with per-package patch indexes | |||
| pkg_cls = self.repository.get_pkg_class(pkg_fullname) | |||
| partial_index = self._index_patches(pkg_cls, self.repository) | |||
| partial_index = self._index_patches(pkg_cls) | |||
There was a problem hiding this comment.
@tgamblin @becker33 Note that this and the line above:
pkg_cls = self.repository.get_pkg_class(pkg_fullname)
partial_index = self._index_patches(pkg_cls)was the main cause for my request ☝️ Now we are using both self.repository and spack.repo.PATH. We should keep that in mind, because if they ever get out of sync (and they probably do if this fixes the issue), they will cause bugs.
There was a problem hiding this comment.
What would be out of sync here? In any given Spack run, the dependency a name refers to is the one in spack.repo.PATH. So this is the only way I see right now to resolve a name that's not in the local repo, and it's the only one we really support (unless the dependency explicitly specifies a namespace, but then you want to go through PATH as well).
I'm not sure what you want this to do.
|
I'm baffled how this auto-merged without passing tests. Working on a fix. If I can't I'll revert. |
Currently, if a package has a dependency from another repository and patches it, generation of the patch cache will fail. Concretization succeeds if a fixed patch cache is in place. - [x] don't assume that patched dependencies are in the same repo when indexing - [x] add some test fixtures to support multi-repo tests. --------- Signed-off-by: Todd Gamblin <tgamblin@llnl.gov> Co-authored-by: Todd Gamblin <tgamblin@llnl.gov>
…pack#47519) This reverts commit da1d533.
Currently, if a package has a dependency from another repository and patches it, generation of the patch cache will fail. Concretization succeeds if a fixed patch cache is in place.