Merged from trunk -r11632:11634

   | 11633   | Avoid raising a KeyError from display_preserved_libs() in    |
   | zmedico | cases when no owners are found for a particular library      |
   |         | consumer.                                                    |

   | 11634   | Make HOMEPAGE.missing a warning since some packages become   |
   | zmedico | homeless even though they still continue to work. Thanks to  |
   |         | Robin H. Johnson <robbat2@g.o> for the suggestion.           |

svn path=/main/branches/prefix/; revision=11635

diff --git a/bin/repoman b/bin/repoman
index 2aaee1915bfa8a5c341890720032f5f745232509..2459412f16be5d525207433b978f89dcd71762f9 100755 (executable)
--- a/bin/repoman
+++ b/bin/repoman
@@ -337,6 +337,7 @@ qawarnings=[
 "KEYWORDS.dropped",
 "KEYWORDS.stupid",
 "KEYWORDS.missing",
+"HOMEPAGE.missing",
 "IUSE.invalid",
 "IUSE.undefined",
 "RDEPEND.suspect",

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index b4d9d955a3fad227ef28ea13e8c80bfb86ce227e..a5700298d3fedae203cfb64ad587ac118829a331 100644 (file)
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -11004,11 +11004,12 @@ def display_preserved_libs(vardbapi):
                                print colorize("WARN", " * ") + " - %s" % f
                                consumers = consumer_map[f]
                                for c in consumers[:MAX_DISPLAY]:
-                                       print colorize("WARN", " * ") + "     used by %s (%s)" % (c, ", ".join([x.mycpv for x in owners[c]]))
+                                       print colorize("WARN", " * ") + "     used by %s (%s)" % \
+                                               (c, ", ".join(x.mycpv for x in owners.get(c, [])))
                                if len(consumers) == MAX_DISPLAY + 1:
                                        print colorize("WARN", " * ") + "     used by %s (%s)" % \
-                                               (consumers[MAX_DISPLAY], ", ".join(
-                                               x.mycpv for x in owners[consumers[MAX_DISPLAY]]))
+                                               (consumers[MAX_DISPLAY], ", ".join(x.mycpv \
+                                               for x in owners.get(consumers[MAX_DISPLAY], [])))
                                elif len(consumers) > MAX_DISPLAY:
                                        print colorize("WARN", " * ") + "     used by %d other files" % (len(consumers) - MAX_DISPLAY)
                print "Use " + colorize("GOOD", "emerge @preserved-rebuild") + " to rebuild packages using these libraries"