| 1 |
Author: zmedico |
| 2 |
Date: 2008-05-02 19:03:28 +0000 (Fri, 02 May 2008) |
| 3 |
New Revision: 10097 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.2/bin/emerge |
| 7 |
Log: |
| 8 |
In depgraph._complete_graph(), use cached Package instances instead |
| 9 |
of constructing new ones. (trunk r10096) |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/branches/2.1.2/bin/emerge |
| 13 |
=================================================================== |
| 14 |
--- main/branches/2.1.2/bin/emerge 2008-05-02 19:02:46 UTC (rev 10096) |
| 15 |
+++ main/branches/2.1.2/bin/emerge 2008-05-02 19:03:28 UTC (rev 10097) |
| 16 |
@@ -3241,7 +3241,7 @@ |
| 17 |
# that are initially satisfied. |
| 18 |
while self._unsatisfied_deps: |
| 19 |
dep = self._unsatisfied_deps.pop() |
| 20 |
- matches = vardb.match(dep.atom) |
| 21 |
+ matches = vardb.match_pkgs(dep.atom) |
| 22 |
if not matches: |
| 23 |
# Initially unsatisfied. |
| 24 |
continue |
| 25 |
@@ -3249,12 +3249,7 @@ |
| 26 |
# Add the installed package to the graph so that it |
| 27 |
# will be appropriately reported as a slot collision |
| 28 |
# (possibly solvable via backtracking). |
| 29 |
- cpv = matches[-1] # highest match |
| 30 |
- metadata = dict(izip(self._mydbapi_keys, |
| 31 |
- vardb.aux_get(cpv, self._mydbapi_keys))) |
| 32 |
- pkg = Package(type_name="installed", root=root, |
| 33 |
- cpv=cpv, metadata=metadata, built=True, |
| 34 |
- installed=True) |
| 35 |
+ pkg = matches[-1] # highest match |
| 36 |
if not self._add_pkg(pkg, dep.parent, |
| 37 |
priority=dep.priority, depth=dep.depth): |
| 38 |
return 0 |
| 39 |
|
| 40 |
-- |
| 41 |
gentoo-commits@l.g.o mailing list |
Archives