diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-05-02 19:03:28 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-05-02 19:03:28 +0000 |
| commit | 048b48cf4a583d507d46d1d5e833f54fb966580e (patch) | |
| tree | db65ee6207724f390d5e6ee3145ce831d251fa90 /bin/emerge | |
| parent | 15b6723922eac690bdb0f7150a02c3b907de093e (diff) | |
| download | portage-048b48cf4a583d507d46d1d5e833f54fb966580e.tar.gz portage-048b48cf4a583d507d46d1d5e833f54fb966580e.tar.bz2 portage-048b48cf4a583d507d46d1d5e833f54fb966580e.zip | |
In depgraph._complete_graph(), use cached Package instances instead
of constructing new ones. (trunk r10096)
svn path=/main/branches/2.1.2/; revision=10097
Diffstat (limited to 'bin/emerge')
| -rwxr-xr-x | bin/emerge | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/bin/emerge b/bin/emerge index 28bdbee1d..af42ebfa5 100755 --- a/bin/emerge +++ b/bin/emerge @@ -3241,7 +3241,7 @@ class depgraph(object): # that are initially satisfied. while self._unsatisfied_deps: dep = self._unsatisfied_deps.pop() - matches = vardb.match(dep.atom) + matches = vardb.match_pkgs(dep.atom) if not matches: # Initially unsatisfied. continue @@ -3249,12 +3249,7 @@ class depgraph(object): # Add the installed package to the graph so that it # will be appropriately reported as a slot collision # (possibly solvable via backtracking). - cpv = matches[-1] # highest match - metadata = dict(izip(self._mydbapi_keys, - vardb.aux_get(cpv, self._mydbapi_keys))) - pkg = Package(type_name="installed", root=root, - cpv=cpv, metadata=metadata, built=True, - installed=True) + pkg = matches[-1] # highest match if not self._add_pkg(pkg, dep.parent, priority=dep.priority, depth=dep.depth): return 0 |