diff options
author | Zac Medico <zmedico@gentoo.org> | 2008-04-09 18:04:29 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2008-04-09 18:04:29 +0000 |
commit | 756ddb5448f29154d3459eb0013578df07f4e3c1 (patch) | |
tree | 9cbe06ba5e3c2b89112e3e82de6297339bdf16df | |
parent | 1020336c192ee7aa7c15696b61846af74a00b6a5 (diff) | |
download | portage-756ddb5448f29154d3459eb0013578df07f4e3c1.tar.gz portage-756ddb5448f29154d3459eb0013578df07f4e3c1.tar.bz2 portage-756ddb5448f29154d3459eb0013578df07f4e3c1.zip |
Fix minor issues in the calculation of the number of parents omitted from
the slot collision display. (trunk r9775)
svn path=/main/branches/2.1.2/; revision=9776
-rwxr-xr-x | bin/emerge | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/bin/emerge b/bin/emerge index dd3f1e7e4..60799cf66 100755 --- a/bin/emerge +++ b/bin/emerge @@ -1753,7 +1753,6 @@ class depgraph(object): if parents: omitted_parents = 0 if len(parents) > max_parents: - omitted_parents = len(parents) - max_parents pruned_list = [] # When generating the pruned list, prefer instances # of DependencyArg over instances of Package. @@ -1768,17 +1767,15 @@ class depgraph(object): in self._slot_collision_info: pruned_list.append(parent) for parent in parents: - if not isinstance(parent, DependencyArg): + if len(pruned_list) >= max_parents: + break + if not isinstance(parent, DependencyArg) and \ + parent not in pruned_list: pruned_list.append(parent) - if len(pruned_list) >= max_parents: - break + omitted_parents = len(parents) - len(pruned_list) parents = pruned_list msg.append(" pulled in by\n") - shown_parents = set() for parent in parents: - if parent in shown_parents: - continue - shown_parents.add(parent) msg.append(2*indent) msg.append(str(parent)) msg.append("\n") |