diff options
| author | Sebastian Luther <SebastianLuther@gmx.de> | 2011-09-19 07:32:08 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-09-19 07:32:08 -0700 |
| commit | d36be695ea48025ba195deb82f51846aee2254ec (patch) | |
| tree | eda736004b7c05c5c909e7b7237689bfdf54e08a /pym/_emerge/main.py | |
| parent | 7e956a6ec65b9b48a9fca3e928e7c7b56fd066b6 (diff) | |
| download | portage-d36be695ea48025ba195deb82f51846aee2254ec.tar.gz portage-d36be695ea48025ba195deb82f51846aee2254ec.tar.bz2 portage-d36be695ea48025ba195deb82f51846aee2254ec.zip | |
autounmask: Add --autounmask-keep-masks option
Disables creation of p.unmask entries to allow users
to insist on their masks and hope for another conflict
resolution (i.e. missed update). This fixes bug 372485.
Diffstat (limited to 'pym/_emerge/main.py')
| -rw-r--r-- | pym/_emerge/main.py | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py index 73d07953e..3f47af789 100644 --- a/pym/_emerge/main.py +++ b/pym/_emerge/main.py @@ -431,6 +431,7 @@ def insert_optional_args(args): default_arg_opts = { '--ask' : y_or_n, '--autounmask' : y_or_n, + '--autounmask-keep-masks': y_or_n, '--autounmask-unrestricted-atoms' : y_or_n, '--autounmask-write' : y_or_n, '--buildpkg' : y_or_n, @@ -610,6 +611,12 @@ def parse_opts(tmpcmdline, silent=False): "choices" : true_y_or_n }, + "--autounmask-keep-masks": { + "help" : "don't add package.unmask entries", + "type" : "choice", + "choices" : true_y_or_n + }, + "--autounmask-write": { "help" : "write changes made by --autounmask to disk", "type" : "choice", @@ -936,6 +943,9 @@ def parse_opts(tmpcmdline, silent=False): if myoptions.autounmask_unrestricted_atoms in true_y: myoptions.autounmask_unrestricted_atoms = True + if myoptions.autounmask_keep_masks in true_y: + myoptions.autounmask_keep_masks = True + if myoptions.autounmask_write in true_y: myoptions.autounmask_write = True |