| 1 |
Author: zmedico |
| 2 |
Date: 2008-05-29 00:37:59 +0000 (Thu, 29 May 2008) |
| 3 |
New Revision: 10472 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.2/bin/emerge |
| 7 |
Log: |
| 8 |
Fix the code from bug #220341 so that it matches the atom against the |
| 9 |
installed package, like it's supposed to. (trunk r10470) |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/branches/2.1.2/bin/emerge |
| 13 |
=================================================================== |
| 14 |
--- main/branches/2.1.2/bin/emerge 2008-05-29 00:35:09 UTC (rev 10471) |
| 15 |
+++ main/branches/2.1.2/bin/emerge 2008-05-29 00:37:59 UTC (rev 10472) |
| 16 |
@@ -3151,13 +3151,23 @@ |
| 17 |
for pkg in matched_packages: |
| 18 |
if not vardb.cpv_exists(pkg.cpv): |
| 19 |
continue |
| 20 |
+ inst_pkg = self._pkg_cache.get( |
| 21 |
+ (pkg_type, root, pkg.cpv, "nomerge")) |
| 22 |
+ if inst_pkg is None: |
| 23 |
+ metadata = izip(self._mydbapi_keys, |
| 24 |
+ vardb.aux_get(cpv, self._mydbapi_keys)) |
| 25 |
+ inst_pkg = Package(built=built, cpv=pkg.cpv, |
| 26 |
+ installed=installed, metadata=metadata, |
| 27 |
+ onlydeps=onlydeps, root_config=root_config, |
| 28 |
+ type_name=pkg_type) |
| 29 |
+ self._pkg_cache[inst_pkg] = inst_pkg |
| 30 |
# Remove the slot from the atom and verify that |
| 31 |
# the package matches the resulting atom. |
| 32 |
atom_without_slot = portage_dep.remove_slot(atom) |
| 33 |
atom_without_slot = portage_dep.Atom(atom_without_slot) |
| 34 |
if portage.match_from_list( |
| 35 |
- atom_without_slot, [pkg]): |
| 36 |
- cpv_list = [pkg.cpv] |
| 37 |
+ atom_without_slot, [inst_pkg]): |
| 38 |
+ cpv_list = [inst_pkg.cpv] |
| 39 |
break |
| 40 |
|
| 41 |
if not cpv_list: |
| 42 |
|
| 43 |
-- |
| 44 |
gentoo-commits@l.g.o mailing list |
Archives