| 1 |
commit: 1ae727e997e2c7915a4384a27c9362e59d8dd074 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Aug 31 12:05:41 2021 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Sep 3 11:26:28 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=1ae727e9 |
| 7 |
|
| 8 |
post_emerge: Display all preserved libs with --verbose |
| 9 |
|
| 10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 11 |
Closes: https://github.com/gentoo/portage/pull/742 |
| 12 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 13 |
|
| 14 |
lib/_emerge/post_emerge.py | 2 +- |
| 15 |
lib/portage/util/_dyn_libs/display_preserved_libs.py | 11 +++++++---- |
| 16 |
2 files changed, 8 insertions(+), 5 deletions(-) |
| 17 |
|
| 18 |
diff --git a/lib/_emerge/post_emerge.py b/lib/_emerge/post_emerge.py |
| 19 |
index 0c4df0d32..c540308d3 100644 |
| 20 |
--- a/lib/_emerge/post_emerge.py |
| 21 |
+++ b/lib/_emerge/post_emerge.py |
| 22 |
@@ -140,7 +140,7 @@ def post_emerge(myaction, myopts, myfiles, |
| 23 |
else: |
| 24 |
print() |
| 25 |
print(colorize("WARN", "!!!") + " existing preserved libs:") |
| 26 |
- display_preserved_libs(vardbapi) |
| 27 |
+ display_preserved_libs(vardbapi, verbose="--verbose" in myopts) |
| 28 |
print("Use " + colorize("GOOD", "emerge @preserved-rebuild") + |
| 29 |
" to rebuild packages using these libraries") |
| 30 |
|
| 31 |
|
| 32 |
diff --git a/lib/portage/util/_dyn_libs/display_preserved_libs.py b/lib/portage/util/_dyn_libs/display_preserved_libs.py |
| 33 |
index 8deafc25e..5818501bb 100644 |
| 34 |
--- a/lib/portage/util/_dyn_libs/display_preserved_libs.py |
| 35 |
+++ b/lib/portage/util/_dyn_libs/display_preserved_libs.py |
| 36 |
@@ -6,7 +6,7 @@ import portage |
| 37 |
|
| 38 |
from portage.output import colorize |
| 39 |
|
| 40 |
-def display_preserved_libs(vardb): |
| 41 |
+def display_preserved_libs(vardb, verbose=False): |
| 42 |
|
| 43 |
MAX_DISPLAY = 3 |
| 44 |
|
| 45 |
@@ -36,7 +36,8 @@ def display_preserved_libs(vardb): |
| 46 |
consumers.append(c) |
| 47 |
consumers.sort() |
| 48 |
consumer_map[f] = consumers |
| 49 |
- search_for_owners.update(consumers[:MAX_DISPLAY+1]) |
| 50 |
+ max_search = None if verbose else MAX_DISPLAY + 1 |
| 51 |
+ search_for_owners.update(consumers[:max_search]) |
| 52 |
|
| 53 |
owners = {} |
| 54 |
for f in search_for_owners: |
| 55 |
@@ -75,7 +76,9 @@ def display_preserved_libs(vardb): |
| 56 |
# they don't need to be rebuilt (see bug #461908). |
| 57 |
consumers = consumers_non_preserved |
| 58 |
|
| 59 |
- if len(consumers) == MAX_DISPLAY + 1: |
| 60 |
+ if verbose: |
| 61 |
+ max_display = None |
| 62 |
+ elif len(consumers) == MAX_DISPLAY + 1: |
| 63 |
# Display 1 extra consumer, instead of displaying |
| 64 |
# "used by 1 other files". |
| 65 |
max_display = MAX_DISPLAY + 1 |
| 66 |
@@ -91,6 +94,6 @@ def display_preserved_libs(vardb): |
| 67 |
owners_desc = ", ".join(x.mycpv for x in owners.get(c, [])) |
| 68 |
print(colorize("WARN", " * ") + " used by %s (%s)" % \ |
| 69 |
(c, owners_desc)) |
| 70 |
- if len(consumers) > max_display: |
| 71 |
+ if not verbose and len(consumers) > max_display: |
| 72 |
print(colorize("WARN", " * ") + " used by %d other files" % |
| 73 |
(len(consumers) - max_display)) |
Archives