| 1 |
commit: 3bdaadba9d326374c978c4a521a9db4125279430 |
| 2 |
Author: Alexander Berntsen <alexander <AT> plaimi <DOT> net> |
| 3 |
AuthorDate: Mon Sep 22 11:51:21 2014 +0000 |
| 4 |
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com> |
| 5 |
CommitDate: Wed Sep 24 22:35:45 2014 +0000 |
| 6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=3bdaadba |
| 7 |
|
| 8 |
emerge: --autounmask-write if --ask (bug 481578) |
| 9 |
|
| 10 |
Signed-off-by: Alexander Berntsen <bernalex <AT> gentoo.org> |
| 11 |
|
| 12 |
--- |
| 13 |
man/emerge.1 | 5 +++-- |
| 14 |
pym/_emerge/depgraph.py | 6 ++++-- |
| 15 |
2 files changed, 7 insertions(+), 4 deletions(-) |
| 16 |
|
| 17 |
diff --git a/man/emerge.1 b/man/emerge.1 |
| 18 |
index e32bb43..a2cb3f6 100644 |
| 19 |
--- a/man/emerge.1 |
| 20 |
+++ b/man/emerge.1 |
| 21 |
@@ -1,4 +1,4 @@ |
| 22 |
-.TH "EMERGE" "1" "Mar 2014" "Portage VERSION" "Portage" |
| 23 |
+.TH "EMERGE" "1" "Sep 2014" "Portage VERSION" "Portage" |
| 24 |
.SH "NAME" |
| 25 |
emerge \- Command\-line interface to the Portage system |
| 26 |
.SH "SYNOPSIS" |
| 27 |
@@ -367,7 +367,8 @@ to config files, respecting \fBCONFIG_PROTECT\fR and \fB\-\-ask\fR. |
| 28 |
If the corresponding package.* is a file, the changes are appended to |
| 29 |
it, if it is a directory, changes are written to the lexicographically |
| 30 |
last file. This way it is always ensured that the new changes take |
| 31 |
-precedence over existing changes. |
| 32 |
+precedence over existing changes. This option is automatically enabled with |
| 33 |
+\-\-ask. |
| 34 |
.TP |
| 35 |
.BR \-\-backtrack=COUNT |
| 36 |
Specifies an integer number of times to backtrack if |
| 37 |
|
| 38 |
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py |
| 39 |
index f6f716d..5180db5 100644 |
| 40 |
--- a/pym/_emerge/depgraph.py |
| 41 |
+++ b/pym/_emerge/depgraph.py |
| 42 |
@@ -7517,12 +7517,14 @@ class depgraph(object): |
| 43 |
(using CONFIG_PROTECT). The message includes the comments and the changes. |
| 44 |
""" |
| 45 |
|
| 46 |
- autounmask_write = self._frozen_config.myopts.get("--autounmask-write", "n") == True |
| 47 |
+ ask = "--ask" in self._frozen_config.myopts |
| 48 |
+ autounmask_write = \ |
| 49 |
+ self._frozen_config.myopts.get("--autounmask-write", |
| 50 |
+ ask) is True |
| 51 |
autounmask_unrestricted_atoms = \ |
| 52 |
self._frozen_config.myopts.get("--autounmask-unrestricted-atoms", "n") == True |
| 53 |
quiet = "--quiet" in self._frozen_config.myopts |
| 54 |
pretend = "--pretend" in self._frozen_config.myopts |
| 55 |
- ask = "--ask" in self._frozen_config.myopts |
| 56 |
enter_invalid = '--ask-enter-invalid' in self._frozen_config.myopts |
| 57 |
|
| 58 |
def check_if_latest(pkg): |
Archives