diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-12-21 00:48:56 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-12-21 00:48:56 +0000 |
| commit | 0e87b1e0e18212efc6a2613547025bf04fe9b715 (patch) | |
| tree | 2496391455168d73cc3bb9d963274a9d581d1d6b | |
| parent | 01bf3fe8e9e466b813ed8eeb3807265f0e7ffcc0 (diff) | |
| download | portage-0e87b1e0e18212efc6a2613547025bf04fe9b715.tar.gz portage-0e87b1e0e18212efc6a2613547025bf04fe9b715.tar.bz2 portage-0e87b1e0e18212efc6a2613547025bf04fe9b715.zip | |
Slightly improved the masked package check inside dep_zapdeps().
(trunk r9006)
svn path=/main/branches/2.1.2/; revision=9007
| -rw-r--r-- | pym/portage.py | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/pym/portage.py b/pym/portage.py index d58a7e929..7be824bc8 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -5210,15 +5210,15 @@ def dep_zapdeps(unreduced, reduced, myroot, use_binaries=0, trees=None): if avail_pkg: avail_slot = "%s:%s" % (dep_getkey(atom), mydbapi.aux_get(avail_pkg, ["SLOT"])[0]) - elif not avail_pkg and \ - (use_binaries or not mydbapi.cp_list(dep_getkey(atom))): - # With --usepkgonly, count installed packages as "available". - # Note that --usepkgonly currently has no package.mask support. - # See bug #149816. - avail_pkg = best(vardb.match(atom)) - if avail_pkg: - avail_slot = "%s:%s" % (dep_getkey(atom), - vardb.aux_get(avail_pkg, ["SLOT"])[0]) + elif not avail_pkg: + has_mask = False + if hasattr(mydbapi, "xmatch"): + has_mask = bool(mydbapi.xmatch("bestmatch-all", atom)) + if (use_binaries or not has_mask): + avail_pkg = best(vardb.match(atom)) + if avail_pkg: + avail_slot = "%s:%s" % (dep_getkey(atom), + vardb.aux_get(avail_pkg, ["SLOT"])[0]) if not avail_pkg: all_available = False break |