From: Fabian Groffen Date: Sun, 5 Oct 2008 18:00:09 +0000 (-0000) Subject: Merged from trunk -r11632:11634 X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=3f1f130e811578c69ee58cd3e0d249e285f87f9c;p=portage.git 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 for the suggestion. | svn path=/main/branches/prefix/; revision=11635 --- diff --git a/bin/repoman b/bin/repoman index 2aaee1915..2459412f1 100755 --- 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 b4d9d955a..a5700298d 100644 --- 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"