diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-07-17 04:15:13 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-07-17 04:15:13 +0000 |
| commit | 42d302bd8efac904a8069ccd503d3c36954bd6fb (patch) | |
| tree | 87c8f4c90051441f194446045918c72e9142565b | |
| parent | 543bb237f93fcb1ff1bd82f58b243302c9497a79 (diff) | |
| download | portage-42d302bd8efac904a8069ccd503d3c36954bd6fb.tar.gz portage-42d302bd8efac904a8069ccd503d3c36954bd6fb.tar.bz2 portage-42d302bd8efac904a8069ccd503d3c36954bd6fb.zip | |
Revert PackageSet.containsCPV() calls back to findAtomForPackage() calls so that things like slot atoms and old-style virtuals are properly supported.
svn path=/main/trunk/; revision=7287
| -rw-r--r-- | pym/emerge/__init__.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py index b540c75c0..804a8f697 100644 --- a/pym/emerge/__init__.py +++ b/pym/emerge/__init__.py @@ -2987,10 +2987,10 @@ class depgraph(object): pkg_system = False pkg_world = False try: - pkg_system = system_set.containsCPV(pkg_key) - pkg_world = world_set.containsCPV(pkg_key) + pkg_system = system_set.findAtomForPackage(pkg_key, metadata) + pkg_world = world_set.findAtomForPackage(pkg_key, metadata) if not pkg_world and myroot == self.target_root and \ - favorites_set.containsCPV(pkg_key): + favorites_set.findAtomForPackage(pkg_key, metadata): # Maybe it will be added to world now. if create_world_atom(pkg_key, metadata, favorites_set, root_config): @@ -3550,7 +3550,7 @@ class MergeTask(object): #buildsyspkg: Check if we need to _force_ binary package creation issyspkg = ("buildsyspkg" in myfeat) \ and x[0] != "blocks" \ - and system_set.containsCPV(pkg_key) \ + and system_set.findAtomForPackage(pkg_key, metadata) \ and "--buildpkg" not in self.myopts if x[0] in ["ebuild","blocks"]: if x[0] == "blocks" and "--fetchonly" not in self.myopts: @@ -3742,7 +3742,7 @@ class MergeTask(object): self.trees[x[1]]["vartree"].inject(x[2]) myfavkey = portage.cpv_getkey(x[2]) if not fetchonly and not pretend and \ - args_set.containsCPV(pkg_key): + args_set.findAtomForPackage(pkg_key, metadata): world_set.lock() world_set.load() # maybe it's changed on disk myfavkey = create_world_atom(pkg_key, metadata, |