diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-07-11 02:54:32 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-07-11 02:54:32 +0000 |
| commit | 6c922fe58c2c04dd6febf66a1ef7b8f53d7ef2b1 (patch) | |
| tree | 8a085fce663efec4500acfdf691e9fadbe11ab40 | |
| parent | 04feea2f5f07952602e0a54c3e8c37f0c9cf9da4 (diff) | |
| download | portage-6c922fe58c2c04dd6febf66a1ef7b8f53d7ef2b1.tar.gz portage-6c922fe58c2c04dd6febf66a1ef7b8f53d7ef2b1.tar.bz2 portage-6c922fe58c2c04dd6febf66a1ef7b8f53d7ef2b1.zip | |
Fix another case similar to bug #184806 that can occur with --onlydeps. (trunk r7226)
svn path=/main/branches/2.1.2/; revision=7227
| -rwxr-xr-x | bin/emerge | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/bin/emerge b/bin/emerge index e52ef1323..78da49f34 100755 --- a/bin/emerge +++ b/bin/emerge @@ -2756,8 +2756,10 @@ class depgraph: pkg_status = x[3] pkg_merge = ordered and pkg_status != "nomerge" binary_package = pkg_type != "ebuild" - if pkg_node in self._slot_collision_nodes: - # The metadata isn't cached due to the slot collision. + if pkg_node in self._slot_collision_nodes or \ + (pkg_status == "nomerge" and pkg_type != "installed"): + # The metadata isn't cached due to a slot collision or + # --onlydeps. mydbapi = self.trees[myroot][self.pkg_tree_map[pkg_type]].dbapi else: mydbapi = self.mydbapi[myroot] # contains cached metadata |