1 |
--- |
2 |
lib/_emerge/post_emerge.py | 2 +- |
3 |
lib/portage/util/_dyn_libs/display_preserved_libs.py | 11 +++++++---- |
4 |
2 files changed, 8 insertions(+), 5 deletions(-) |
5 |
|
6 |
diff --git a/lib/_emerge/post_emerge.py b/lib/_emerge/post_emerge.py |
7 |
index 0c4df0d32..c540308d3 100644 |
8 |
--- a/lib/_emerge/post_emerge.py |
9 |
+++ b/lib/_emerge/post_emerge.py |
10 |
@@ -140,7 +140,7 @@ def post_emerge(myaction, myopts, myfiles, |
11 |
else: |
12 |
print() |
13 |
print(colorize("WARN", "!!!") + " existing preserved libs:") |
14 |
- display_preserved_libs(vardbapi) |
15 |
+ display_preserved_libs(vardbapi, verbose="--verbose" in myopts) |
16 |
print("Use " + colorize("GOOD", "emerge @preserved-rebuild") + |
17 |
" to rebuild packages using these libraries") |
18 |
|
19 |
diff --git a/lib/portage/util/_dyn_libs/display_preserved_libs.py b/lib/portage/util/_dyn_libs/display_preserved_libs.py |
20 |
index 8deafc25e..5818501bb 100644 |
21 |
--- a/lib/portage/util/_dyn_libs/display_preserved_libs.py |
22 |
+++ b/lib/portage/util/_dyn_libs/display_preserved_libs.py |
23 |
@@ -6,7 +6,7 @@ import portage |
24 |
|
25 |
from portage.output import colorize |
26 |
|
27 |
-def display_preserved_libs(vardb): |
28 |
+def display_preserved_libs(vardb, verbose=False): |
29 |
|
30 |
MAX_DISPLAY = 3 |
31 |
|
32 |
@@ -36,7 +36,8 @@ def display_preserved_libs(vardb): |
33 |
consumers.append(c) |
34 |
consumers.sort() |
35 |
consumer_map[f] = consumers |
36 |
- search_for_owners.update(consumers[:MAX_DISPLAY+1]) |
37 |
+ max_search = None if verbose else MAX_DISPLAY + 1 |
38 |
+ search_for_owners.update(consumers[:max_search]) |
39 |
|
40 |
owners = {} |
41 |
for f in search_for_owners: |
42 |
@@ -75,7 +76,9 @@ def display_preserved_libs(vardb): |
43 |
# they don't need to be rebuilt (see bug #461908). |
44 |
consumers = consumers_non_preserved |
45 |
|
46 |
- if len(consumers) == MAX_DISPLAY + 1: |
47 |
+ if verbose: |
48 |
+ max_display = None |
49 |
+ elif len(consumers) == MAX_DISPLAY + 1: |
50 |
# Display 1 extra consumer, instead of displaying |
51 |
# "used by 1 other files". |
52 |
max_display = MAX_DISPLAY + 1 |
53 |
@@ -91,6 +94,6 @@ def display_preserved_libs(vardb): |
54 |
owners_desc = ", ".join(x.mycpv for x in owners.get(c, [])) |
55 |
print(colorize("WARN", " * ") + " used by %s (%s)" % \ |
56 |
(c, owners_desc)) |
57 |
- if len(consumers) > max_display: |
58 |
+ if not verbose and len(consumers) > max_display: |
59 |
print(colorize("WARN", " * ") + " used by %d other files" % |
60 |
(len(consumers) - max_display)) |
61 |
-- |
62 |
2.33.0 |