From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 2 Sep 2006 23:24:24 +0000 (-0000)
Subject: Make code from the last 2 commits conditional on merging == 0 and vardbapi.cpv_exists... 
X-Git-Tag: v2.1.1~30
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9a276247dafe0626785eda4c176d13c50bb9f5c0;p=portage.git

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

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

diff --git a/bin/emerge b/bin/emerge
index 136080e49..5bcb6eaa4 100755
--- 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