diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-12-20 13:06:15 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-12-20 13:06:15 +0000 |
| commit | f5cff23564a9b30cf9d867a155969cb6e65577ad (patch) | |
| tree | 32bc85c27bc95e1172c02039fb149ff33ce5e494 /pym | |
| parent | 3326e7a7e7035925186bc5ef51ebad14871abd10 (diff) | |
| download | portage-f5cff23564a9b30cf9d867a155969cb6e65577ad.tar.gz portage-f5cff23564a9b30cf9d867a155969cb6e65577ad.tar.bz2 portage-f5cff23564a9b30cf9d867a155969cb6e65577ad.zip | |
Make dep_zapdeps() fall back to installed packages in it's
availability test in cases where the package does not
appear to be masked. This solves dep selection preference
issues when working without a portage tree.
svn path=/main/trunk/; revision=8988
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage/__init__.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index b174a12ac..8f75a319a 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -5230,7 +5230,8 @@ 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: + 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. |