summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-07-10 00:57:38 +0000
committerZac Medico <zmedico@gentoo.org>2006-07-10 00:57:38 +0000
commit9ff39467e5a66ab3eb8eeea577dbf2a597e601db (patch)
tree51dede454354adf9f28373988dc69f3e3fac8cd5
parent385006f13188636b926d959e51591d3d0d07812c (diff)
downloadportage-9ff39467e5a66ab3eb8eeea577dbf2a597e601db.tar.gz
portage-9ff39467e5a66ab3eb8eeea577dbf2a597e601db.tar.bz2
portage-9ff39467e5a66ab3eb8eeea577dbf2a597e601db.zip
Allow binary packages to be installed with --usepkg even when there is no ebuild in tree (but not when there is a matching ebuild in the tree that is masked). See bugs #135834 and #55871.
svn path=/main/trunk/; revision=3827
-rwxr-xr-xbin/emerge5
1 files changed, 3 insertions, 2 deletions
diff --git a/bin/emerge b/bin/emerge
index 701684bf9..ec86a3635 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -1018,8 +1018,9 @@ class depgraph:
myeb_pkg_matches = bindb.match(x)
if "--usepkgonly" not in self.myopts:
# Remove any binary package entries that are masked in the portage tree (#55871)
- for idx in range(len(myeb_pkg_matches)-1,-1,-1):
- if myeb_pkg_matches[idx] not in myeb_matches:
+ for idx in xrange(len(myeb_pkg_matches)):
+ if myeb_pkg_matches[idx] not in myeb_matches and \
+ portdb.cpv_exists(myeb_pkg_matches[idx]):
del myeb_pkg_matches[idx]
myeb_pkg = portage.best(myeb_pkg_matches)