Fix --usepkg --newuse logic so that it doesn't throw a KeyError if there's no matchin...

svn path=/main/trunk/; revision=4748

diff --git a/bin/emerge b/bin/emerge
index ea4162d6ca788203a9c0ee818adbb6265c15d98b..1bc29c9161c865a366b252810beeedf7a168c79a 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -1246,7 +1246,10 @@ class depgraph:
                                        iuses = set(filter_iuse_defaults(
                                                bindb.aux_get(myeb_pkg, ["IUSE"])[0].split()))
                                        old_use = bindb.aux_get(myeb_pkg, ["USE"])[0].split()
-                                       pkgsettings.setcpv(myeb_pkg, mydb=portdb)
+                                       mydb = None
+                                       if "--usepkgonly" not in self.myopts and myeb:
+                                               mydb = portdb
+                                       pkgsettings.setcpv(myeb, mydb=mydb)
                                        now_use = pkgsettings["USE"].split()
                                        forced_flags = set()
                                        forced_flags.update(pkgsettings.useforce)