| 1 |
From: Alexander Berntsen <alexander@××××××.net> |
| 2 |
|
| 3 |
Signed-off-by: Alexander Berntsen <bernalex@g.o> |
| 4 |
--- |
| 5 |
For Brian to review, and anyone else who feels like it. |
| 6 |
|
| 7 |
man/emerge.1 | 3 ++- |
| 8 |
pym/_emerge/depgraph.py | 7 +++++-- |
| 9 |
2 files changed, 7 insertions(+), 3 deletions(-) |
| 10 |
|
| 11 |
diff --git a/man/emerge.1 b/man/emerge.1 |
| 12 |
index e32bb43..8bf3db1 100644 |
| 13 |
--- a/man/emerge.1 |
| 14 |
+++ b/man/emerge.1 |
| 15 |
@@ -367,7 +367,8 @@ to config files, respecting \fBCONFIG_PROTECT\fR and \fB\-\-ask\fR. |
| 16 |
If the corresponding package.* is a file, the changes are appended to |
| 17 |
it, if it is a directory, changes are written to the lexicographically |
| 18 |
last file. This way it is always ensured that the new changes take |
| 19 |
-precedence over existing changes. |
| 20 |
+precedence over existing changes. This option is automatically enabled with |
| 21 |
+\-\-ask. |
| 22 |
.TP |
| 23 |
.BR \-\-backtrack=COUNT |
| 24 |
Specifies an integer number of times to backtrack if |
| 25 |
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py |
| 26 |
index cc87d9f..baa3129 100644 |
| 27 |
--- a/pym/_emerge/depgraph.py |
| 28 |
+++ b/pym/_emerge/depgraph.py |
| 29 |
@@ -7430,12 +7430,15 @@ class depgraph(object): |
| 30 |
(using CONFIG_PROTECT). The message includes the comments and the changes. |
| 31 |
""" |
| 32 |
|
| 33 |
- autounmask_write = self._frozen_config.myopts.get("--autounmask-write", "n") == True |
| 34 |
+ ask = "--ask" in self._frozen_config.myopts |
| 35 |
+ autounmask_write_y = \ |
| 36 |
+ self._frozen_config.myopts.get("--autounmask-write", "y") |
| 37 |
+ autounmask_write = not autounmask_write_y == "n" and \ |
| 38 |
+ (ask or autounmask_write_y == True) |
| 39 |
autounmask_unrestricted_atoms = \ |
| 40 |
self._frozen_config.myopts.get("--autounmask-unrestricted-atoms", "n") == True |
| 41 |
quiet = "--quiet" in self._frozen_config.myopts |
| 42 |
pretend = "--pretend" in self._frozen_config.myopts |
| 43 |
- ask = "--ask" in self._frozen_config.myopts |
| 44 |
enter_invalid = '--ask-enter-invalid' in self._frozen_config.myopts |
| 45 |
|
| 46 |
def check_if_latest(pkg): |
| 47 |
-- |
| 48 |
1.8.5.5 |
Archives