From 241e9cdb1bc3e0b6878019c1730edb4bc2809821 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 6 Oct 2008 02:47:37 +0000 Subject: [PATCH] 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 --- pym/_emerge/__init__.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 1add5ed5d..910e518d9 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)" % \ -- 2.26.2