Make code from the last 2 commits conditional on merging == 0 and vardbapi.cpv_exists...

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

diff --git a/bin/emerge b/bin/emerge
index 136080e49441eeb9c4ed3842c3ba847c04ee3177..5bcb6eaa48606e2ad820dfb25adb774e7eb89050 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -774,6 +774,8 @@ class depgraph:
                        mybigkey.append("merge")
                else:
                        mybigkey.append("nomerge")
+
+               if merging == 0 and vardbapi.cpv_exists(mykey):
                        myuse = vardbapi.aux_get(mykey, ["USE"])[0].split()
                        self.useFlags[myroot][mykey] = myuse