| 1 |
--- |
| 2 |
pym/_emerge/actions.py | 5 +++++ |
| 3 |
pym/_emerge/depgraph.py | 5 +++-- |
| 4 |
pym/_emerge/main.py | 5 +++++ |
| 5 |
pym/portage/package/ebuild/config.py | 3 +++ |
| 6 |
4 files changed, 16 insertions(+), 2 deletions(-) |
| 7 |
|
| 8 |
diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py |
| 9 |
index 95c5c14..a3f7813 100644 |
| 10 |
--- a/pym/_emerge/actions.py |
| 11 |
+++ b/pym/_emerge/actions.py |
| 12 |
@@ -2923,6 +2923,11 @@ def adjust_config(myopts, settings): |
| 13 |
settings["PORTAGE_VERBOSE"] = "1" |
| 14 |
settings.backup_changes("PORTAGE_VERBOSE") |
| 15 |
|
| 16 |
+ if ("--verbose-slot-rebuilds" in myopts and |
| 17 |
+ myopts["--verbose-slot-rebuilds"] not in ("y","True")): |
| 18 |
+ settings["VERBOSE_SLOT_REBUILDS"] = "0" |
| 19 |
+ settings.backup_changes("VERBOSE_SLOT_REBUILDS") |
| 20 |
+ |
| 21 |
# Set so that configs will be merged regardless of remembered status |
| 22 |
if ("--noconfmem" in myopts): |
| 23 |
settings["NOCONFMEM"]="1" |
| 24 |
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py |
| 25 |
index 835bd6b..7cc2ffe 100644 |
| 26 |
--- a/pym/_emerge/depgraph.py |
| 27 |
+++ b/pym/_emerge/depgraph.py |
| 28 |
@@ -7692,8 +7692,9 @@ class depgraph(object): |
| 29 |
if not unresolved_conflicts: |
| 30 |
self._show_missed_update() |
| 31 |
|
| 32 |
- self._compute_abi_rebuild_info() |
| 33 |
- self._show_abi_rebuild_info() |
| 34 |
+ if self._frozen_config.settings["VERBOSE_SLOT_REBUILDS"] == "1": |
| 35 |
+ self._compute_abi_rebuild_info() |
| 36 |
+ self._show_abi_rebuild_info() |
| 37 |
|
| 38 |
self._show_ignored_binaries() |
| 39 |
|
| 40 |
diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py |
| 41 |
index 6225fc9..1e21ddb 100644 |
| 42 |
--- a/pym/_emerge/main.py |
| 43 |
+++ b/pym/_emerge/main.py |
| 44 |
@@ -156,6 +156,7 @@ def insert_optional_args(args): |
| 45 |
'--usepkg' : y_or_n, |
| 46 |
'--usepkgonly' : y_or_n, |
| 47 |
'--verbose' : y_or_n, |
| 48 |
+ '--verbose-slot-rebuilds': y_or_n, |
| 49 |
} |
| 50 |
|
| 51 |
short_arg_opts = { |
| 52 |
@@ -640,6 +641,10 @@ def parse_opts(tmpcmdline, silent=False): |
| 53 |
"help" : "verbose output", |
| 54 |
"choices" : true_y_or_n |
| 55 |
}, |
| 56 |
+ "--verbose-slot-rebuilds": { |
| 57 |
+ "help" : "verbose slot rebuild output", |
| 58 |
+ "choices" : true_y_or_n |
| 59 |
+ }, |
| 60 |
} |
| 61 |
|
| 62 |
parser = ArgumentParser(add_help=False) |
| 63 |
diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py |
| 64 |
index e104501..ba9b502 100644 |
| 65 |
--- a/pym/portage/package/ebuild/config.py |
| 66 |
+++ b/pym/portage/package/ebuild/config.py |
| 67 |
@@ -827,6 +827,9 @@ class config(object): |
| 68 |
"PORTAGE_INST_UID": "0", |
| 69 |
} |
| 70 |
|
| 71 |
+ # Turn this on by default |
| 72 |
+ self["VERBOSE_SLOT_REBUILDS"] = "1" |
| 73 |
+ |
| 74 |
if eprefix: |
| 75 |
# For prefix environments, default to the UID and GID of |
| 76 |
# the top-level EROOT directory. |
| 77 |
-- |
| 78 |
1.8.5.3 |
Archives