From 7209946c181c264c96adab8ddae77f884bd710cc Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 28 Mar 2007 17:14:58 +0000 Subject: Correctly pull the metadata again when the node is converted. svn path=/main/trunk/; revision=6307 --- pym/emerge/__init__.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'pym') diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py index 6304f25f3..d41d9af0b 100644 --- a/pym/emerge/__init__.py +++ b/pym/emerge/__init__.py @@ -1160,13 +1160,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) -- cgit v1.2.3-1-g7c22