From 9ff39467e5a66ab3eb8eeea577dbf2a597e601db Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 10 Jul 2006 00:57:38 +0000 Subject: 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 --- bin/emerge | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'bin/emerge') 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) -- cgit v1.2.3-1-g7c22