diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2008-10-06 02:47:37 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-10-06 02:47:37 +0000 |
| commit | 241e9cdb1bc3e0b6878019c1730edb4bc2809821 (patch) | |
| tree | a66304da881e75be2863bc789c5df5c0b517637f | |
| parent | Bug #240022 - Avoid duplicate output for the same library (due to symlinks) (diff) | |
| download | portage-multirepo-241e9cdb1bc3e0b6878019c1730edb4bc2809821.tar.gz portage-multirepo-241e9cdb1bc3e0b6878019c1730edb4bc2809821.tar.bz2 portage-multirepo-241e9cdb1bc3e0b6878019c1730edb4bc2809821.zip | |
Fix KeyError raised from display_preserved_libs() when the realpath is used
as a key in consumer_map instead of the orignal path that was returned from
the PreservedLibsRegistry.
svn path=/main/trunk/; revision=11637
| -rw-r--r-- | pym/_emerge/__init__.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 1add5ed5..910e518d 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -10967,9 +10967,11 @@ def display_preserved_libs(vardbapi): samefile_map[real_path] = alt_paths alt_paths.add(f) - for f, alt_paths in samefile_map.iteritems(): - for p in sorted(alt_paths): + for alt_paths in samefile_map.itervalues(): + alt_paths = sorted(alt_paths) + for p in alt_paths: print colorize("WARN", " * ") + " - %s" % (p,) + f = alt_paths[0] consumers = consumer_map[f] for c in consumers[:MAX_DISPLAY]: print colorize("WARN", " * ") + " used by %s (%s)" % \ |