diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-04-05 19:00:38 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-04-05 19:00:38 +0000 |
| commit | 055a588d2b4ae8135ab5bef77949b3b8c99d2019 (patch) | |
| tree | 9177c4c93c9a4ed66e99fb32fe3a3ac9464d015f /pym | |
| parent | f13390d3a1d649a95d26dbf63b3be8d4d3f1c47e (diff) | |
| download | portage-055a588d2b4ae8135ab5bef77949b3b8c99d2019.tar.gz portage-055a588d2b4ae8135ab5bef77949b3b8c99d2019.tar.bz2 portage-055a588d2b4ae8135ab5bef77949b3b8c99d2019.zip | |
For better performace and consistency in package selection, merge the
CompositeDbapi code from trunk.
svn path=/main/branches/2.1.2/; revision=9721
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage.py | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/pym/portage.py b/pym/portage.py index c14aa0353..8cf24bd7a 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -5354,7 +5354,6 @@ def dep_zapdeps(unreduced, reduced, myroot, use_binaries=0, trees=None): if trees is None: global db trees = db - selective = trees[myroot].get("selective", False) writemsg("ZapDeps -- %s\n" % (use_binaries), 2) if not reduced or unreduced == ["||"] or dep_eval(reduced): return [] @@ -5415,13 +5414,6 @@ def dep_zapdeps(unreduced, reduced, myroot, use_binaries=0, trees=None): avail_pkg = avail_pkg[-1] # highest (ascending order) avail_slot = "%s:%s" % (dep_getkey(atom), mydbapi.aux_get(avail_pkg, ["SLOT"])[0]) - elif not avail_pkg: - if selective: - avail_pkg = vardb.match(atom) - if avail_pkg: - avail_pkg = avail_pkg[-1] # highest (ascending order) - avail_slot = "%s:%s" % (dep_getkey(atom), - vardb.aux_get(avail_pkg, ["SLOT"])[0]) if not avail_pkg: all_available = False break |