summaryrefslogtreecommitdiffstats
path: root/bin/emerge
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-11-06 05:59:26 +0000
committerZac Medico <zmedico@gentoo.org>2006-11-06 05:59:26 +0000
commitf03be2d0b764880ab07a76505a7f7fdfc39507aa (patch)
tree830fea8cda9a2630cd7a6b35a2d39025bae47532 /bin/emerge
parenteeb861b575637377253e87006658ae70ffb7da02 (diff)
downloadportage-f03be2d0b764880ab07a76505a7f7fdfc39507aa.tar.gz
portage-f03be2d0b764880ab07a76505a7f7fdfc39507aa.tar.bz2
portage-f03be2d0b764880ab07a76505a7f7fdfc39507aa.zip
Prevent the --newuse check in depgraph.create() that is intended for the ebuild type from being done on binary packages (which can lead to a KeyError). The --newuse check for binaries is elsewhere (in select_dep).
svn path=/main/trunk/; revision=4947
Diffstat (limited to 'bin/emerge')
-rwxr-xr-xbin/emerge1
1 files changed, 1 insertions, 0 deletions
diff --git a/bin/emerge b/bin/emerge
index 932ad65b1..80c0514d3 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -841,6 +841,7 @@ class depgraph:
If the package has new iuse flags or different use flags then if
--newuse is specified, we need to merge the package. """
if merging==0 and "--newuse" in self.myopts and \
+ mytype == "ebuild" and \
vardbapi.cpv_exists(mykey):
pkgsettings.setcpv(mykey, mydb=portdb)
forced_flags = set()