diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-03-28 17:18:10 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-03-28 17:18:10 +0000 |
| commit | ee109832e93b3b6e24e0119de69da86b1a695575 (patch) | |
| tree | 675f05d0aca51a9cf0ba2f1f4a2422f2979ec26f | |
| parent | 7b9668867881dd064673cd026923c6aa49aebba9 (diff) | |
| download | portage-ee109832e93b3b6e24e0119de69da86b1a695575.tar.gz portage-ee109832e93b3b6e24e0119de69da86b1a695575.tar.bz2 portage-ee109832e93b3b6e24e0119de69da86b1a695575.zip | |
Correctly pull the metadata again when the node is converted. (trunk r6306:6307)
svn path=/main/branches/2.1.2/; revision=6308
| -rwxr-xr-x | bin/emerge | 11 |
1 files changed, 6 insertions, 5 deletions
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) |