1 |
From: Alexander Berntsen <alexander@××××××.net> |
2 |
|
3 |
Signed-off-by: Alexander Berntsen <bernalex@g.o> |
4 |
--- |
5 |
Update manpage header, as pointed out by Arfrever. |
6 |
|
7 |
man/emerge.1 | 5 +++-- |
8 |
pym/_emerge/depgraph.py | 6 ++++-- |
9 |
2 files changed, 7 insertions(+), 4 deletions(-) |
10 |
|
11 |
diff --git a/man/emerge.1 b/man/emerge.1 |
12 |
index e32bb43..a2cb3f6 100644 |
13 |
--- a/man/emerge.1 |
14 |
+++ b/man/emerge.1 |
15 |
@@ -1,4 +1,4 @@ |
16 |
-.TH "EMERGE" "1" "Mar 2014" "Portage VERSION" "Portage" |
17 |
+.TH "EMERGE" "1" "Sep 2014" "Portage VERSION" "Portage" |
18 |
.SH "NAME" |
19 |
emerge \- Command\-line interface to the Portage system |
20 |
.SH "SYNOPSIS" |
21 |
@@ -367,7 +367,8 @@ to config files, respecting \fBCONFIG_PROTECT\fR and \fB\-\-ask\fR. |
22 |
If the corresponding package.* is a file, the changes are appended to |
23 |
it, if it is a directory, changes are written to the lexicographically |
24 |
last file. This way it is always ensured that the new changes take |
25 |
-precedence over existing changes. |
26 |
+precedence over existing changes. This option is automatically enabled with |
27 |
+\-\-ask. |
28 |
.TP |
29 |
.BR \-\-backtrack=COUNT |
30 |
Specifies an integer number of times to backtrack if |
31 |
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py |
32 |
index 6332733..9f88df3 100644 |
33 |
--- a/pym/_emerge/depgraph.py |
34 |
+++ b/pym/_emerge/depgraph.py |
35 |
@@ -7514,12 +7514,14 @@ class depgraph(object): |
36 |
(using CONFIG_PROTECT). The message includes the comments and the changes. |
37 |
""" |
38 |
|
39 |
- autounmask_write = self._frozen_config.myopts.get("--autounmask-write", "n") == True |
40 |
+ ask = "--ask" in self._frozen_config.myopts |
41 |
+ autounmask_write = \ |
42 |
+ self._frozen_config.myopts.get("--autounmask-write", |
43 |
+ ask) is True |
44 |
autounmask_unrestricted_atoms = \ |
45 |
self._frozen_config.myopts.get("--autounmask-unrestricted-atoms", "n") == True |
46 |
quiet = "--quiet" in self._frozen_config.myopts |
47 |
pretend = "--pretend" in self._frozen_config.myopts |
48 |
- ask = "--ask" in self._frozen_config.myopts |
49 |
enter_invalid = '--ask-enter-invalid' in self._frozen_config.myopts |
50 |
|
51 |
def check_if_latest(pkg): |
52 |
-- |
53 |
1.8.5.5 |