| 1 |
Author: grobian |
| 2 |
Date: 2008-10-05 18:00:09 +0000 (Sun, 05 Oct 2008) |
| 3 |
New Revision: 11635 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/prefix/bin/repoman |
| 7 |
main/branches/prefix/pym/_emerge/__init__.py |
| 8 |
Log: |
| 9 |
Merged from trunk -r11632:11634 |
| 10 |
|
| 11 |
| 11633 | Avoid raising a KeyError from display_preserved_libs() in | |
| 12 |
| zmedico | cases when no owners are found for a particular library | |
| 13 |
| | consumer. | |
| 14 |
|
| 15 |
| 11634 | Make HOMEPAGE.missing a warning since some packages become | |
| 16 |
| zmedico | homeless even though they still continue to work. Thanks to | |
| 17 |
| | Robin H. Johnson <robbat2@g.o> for the suggestion. | |
| 18 |
|
| 19 |
|
| 20 |
Modified: main/branches/prefix/bin/repoman |
| 21 |
=================================================================== |
| 22 |
--- main/branches/prefix/bin/repoman 2008-10-05 17:04:09 UTC (rev 11634) |
| 23 |
+++ main/branches/prefix/bin/repoman 2008-10-05 18:00:09 UTC (rev 11635) |
| 24 |
@@ -337,6 +337,7 @@ |
| 25 |
"KEYWORDS.dropped", |
| 26 |
"KEYWORDS.stupid", |
| 27 |
"KEYWORDS.missing", |
| 28 |
+"HOMEPAGE.missing", |
| 29 |
"IUSE.invalid", |
| 30 |
"IUSE.undefined", |
| 31 |
"RDEPEND.suspect", |
| 32 |
|
| 33 |
Modified: main/branches/prefix/pym/_emerge/__init__.py |
| 34 |
=================================================================== |
| 35 |
--- main/branches/prefix/pym/_emerge/__init__.py 2008-10-05 17:04:09 UTC (rev 11634) |
| 36 |
+++ main/branches/prefix/pym/_emerge/__init__.py 2008-10-05 18:00:09 UTC (rev 11635) |
| 37 |
@@ -11004,11 +11004,12 @@ |
| 38 |
print colorize("WARN", " * ") + " - %s" % f |
| 39 |
consumers = consumer_map[f] |
| 40 |
for c in consumers[:MAX_DISPLAY]: |
| 41 |
- print colorize("WARN", " * ") + " used by %s (%s)" % (c, ", ".join([x.mycpv for x in owners[c]])) |
| 42 |
+ print colorize("WARN", " * ") + " used by %s (%s)" % \ |
| 43 |
+ (c, ", ".join(x.mycpv for x in owners.get(c, []))) |
| 44 |
if len(consumers) == MAX_DISPLAY + 1: |
| 45 |
print colorize("WARN", " * ") + " used by %s (%s)" % \ |
| 46 |
- (consumers[MAX_DISPLAY], ", ".join( |
| 47 |
- x.mycpv for x in owners[consumers[MAX_DISPLAY]])) |
| 48 |
+ (consumers[MAX_DISPLAY], ", ".join(x.mycpv \ |
| 49 |
+ for x in owners.get(consumers[MAX_DISPLAY], []))) |
| 50 |
elif len(consumers) > MAX_DISPLAY: |
| 51 |
print colorize("WARN", " * ") + " used by %d other files" % (len(consumers) - MAX_DISPLAY) |
| 52 |
print "Use " + colorize("GOOD", "emerge @preserved-rebuild") + " to rebuild packages using these libraries" |
Archives