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