From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 28 Mar 2007 17:18:10 +0000 (-0000)
Subject: Correctly pull the metadata again when the node is converted. (trunk r6306:6307)
X-Git-Tag: v2.1.2.3~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ee109832e93b3b6e24e0119de69da86b1a695575;p=portage.git

Correctly pull the metadata again when the node is converted. (trunk r6306:6307)

svn path=/main/branches/2.1.2/; revision=6308
---

diff --git a/bin/emerge b/bin/emerge
index 3636c22cd..10e52f801 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -1158,13 +1158,14 @@ class depgraph:
 		if addme:
 			metadata = dict(izip(self._mydbapi_keys,
 				mydbapi.aux_get(mykey, self._mydbapi_keys)))
-			if merging == 0 and vardbapi.cpv_exists(mykey):
+			if merging == 0 and vardbapi.cpv_exists(mykey) and \
+				mytype != "installed":
 				mybigkey[0] = "installed"
-				jbigkey = tuple(mybigkey)
 				mydbapi = vardbapi
-				metadata["USE"] = vardbapi.aux_get(mykey, ["USE"])[0]
-				myuse = metadata["USE"].split()
-				metadata["SLOT"] = vardbapi.aux_get(mykey, ["SLOT"])[0]
+				jbigkey = tuple(mybigkey)
+				metadata = dict(izip(self._mydbapi_keys,
+					mydbapi.aux_get(mykey, self._mydbapi_keys)))
+				myuse = mydbapi.aux_get(mykey, ["USE"])[0].split()
 			slot_atom = "%s:%s" % (portage.dep_getkey(mykey), metadata["SLOT"])
 			existing_node = self._slot_node_map[myroot].get(
 				slot_atom, None)