diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-03-28 17:14:58 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-03-28 17:14:58 +0000 |
| commit | 7209946c181c264c96adab8ddae77f884bd710cc (patch) | |
| tree | 37b407519e34cd0b67f7d014474464c3562945b1 /pym | |
| parent | 5b0377ffffec6e224085183e72c1f30b7680d49c (diff) | |
| download | portage-7209946c181c264c96adab8ddae77f884bd710cc.tar.gz portage-7209946c181c264c96adab8ddae77f884bd710cc.tar.bz2 portage-7209946c181c264c96adab8ddae77f884bd710cc.zip | |
Correctly pull the metadata again when the node is converted.
svn path=/main/trunk/; revision=6307
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/emerge/__init__.py | 11 |
1 files changed, 6 insertions, 5 deletions
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) |