| 1 |
From: Alexander Berntsen <alexander@××××××.net> |
| 2 |
|
| 3 |
Signed-off-by: Alexander Berntsen <bernalex@g.o> |
| 4 |
--- |
| 5 |
man/emerge.1 | 9 +++++---- |
| 6 |
pym/_emerge/depgraph.py | 5 +++-- |
| 7 |
2 files changed, 8 insertions(+), 6 deletions(-) |
| 8 |
|
| 9 |
diff --git a/man/emerge.1 b/man/emerge.1 |
| 10 |
index be52f25..c52cd0a 100644 |
| 11 |
--- a/man/emerge.1 |
| 12 |
+++ b/man/emerge.1 |
| 13 |
@@ -345,10 +345,11 @@ Write required unmask changes to the relevant config files, respecting |
| 14 |
\fBCONFIG_PROTECT\fR. If invoked together with \fB\-\-ask\fR, emerge will |
| 15 |
prompt you to write the changes. If invoked along with \fB\-\-pretend\fR, |
| 16 |
emerge will merely output the required changes and not make any of them by |
| 17 |
-itself. If the corresponding package.* is a file, the changes are appended to |
| 18 |
-it, if it is a directory, changes are written to the lexicographically last |
| 19 |
-file. This way it is always ensured that the new changes take precedence over |
| 20 |
-existing changes. |
| 21 |
+itself. This option is enabled by default if are running emerge with |
| 22 |
+\fB\-\-ask\fR or \fB\-\-pretend\fR, and disabled by default elsewise. If the |
| 23 |
+corresponding package.* is a file, the changes are appended to it, if it is a |
| 24 |
+directory, changes are written to the lexicographically last file. This way it |
| 25 |
+is always ensured that the new changes take precedence over existing changes. |
| 26 |
.TP |
| 27 |
.BR "\-\-autounmask\-unrestricted\-atoms [ y | n ]" |
| 28 |
Keyword and mask changes using the \'=\' operator will be written. With this |
| 29 |
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py |
| 30 |
index 0c6b8e3..bfa63fa 100644 |
| 31 |
--- a/pym/_emerge/depgraph.py |
| 32 |
+++ b/pym/_emerge/depgraph.py |
| 33 |
@@ -7332,12 +7332,13 @@ class depgraph(object): |
| 34 |
(using CONFIG_PROTECT). The message includes the comments and the changes. |
| 35 |
""" |
| 36 |
|
| 37 |
- autounmask_write = self._frozen_config.myopts.get("--autounmask", "n") == True |
| 38 |
+ ask = "--ask" in self._frozen_config.myopts |
| 39 |
+ autounmask_write = ask or \ |
| 40 |
+ self._frozen_config.myopts.get("--autounmask", "n") == True |
| 41 |
autounmask_unrestricted_atoms = \ |
| 42 |
self._frozen_config.myopts.get("--autounmask-unrestricted-atoms", "n") == True |
| 43 |
quiet = "--quiet" in self._frozen_config.myopts |
| 44 |
pretend = "--pretend" in self._frozen_config.myopts |
| 45 |
- ask = "--ask" in self._frozen_config.myopts |
| 46 |
enter_invalid = '--ask-enter-invalid' in self._frozen_config.myopts |
| 47 |
|
| 48 |
def check_if_latest(pkg): |
| 49 |
-- |
| 50 |
1.8.5.5 |
Archives