diff options
author | Zac Medico <zmedico@gentoo.org> | 2010-08-05 02:45:29 -0700 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2010-08-05 02:45:29 -0700 |
commit | 03a201256ab9a8557862e30732ecc9b7de19a885 (patch) | |
tree | 041008b57f7776399ca5aee338760b72b0c605cb /pym/_emerge/main.py | |
parent | f27e8b3aa5e5feec5095ee199f04b61367841979 (diff) | |
download | portage-03a201256ab9a8557862e30732ecc9b7de19a885.tar.gz portage-03a201256ab9a8557862e30732ecc9b7de19a885.tar.bz2 portage-03a201256ab9a8557862e30732ecc9b7de19a885.zip |
* Add a --autounmask[=n] option and for now leave it disable
by default in order to minimize the impact of any bugs.
* If _wrapped_select_pkg_highest_available_imp returns an installed
package when the user has not explicitly requested for this package
to be replaced (typically via an atom on the command line), reject
the installed package and try to unmask one.
Diffstat (limited to 'pym/_emerge/main.py')
-rw-r--r-- | pym/_emerge/main.py | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py index b2bb362f8..92df3bfb4 100644 --- a/pym/_emerge/main.py +++ b/pym/_emerge/main.py @@ -388,6 +388,7 @@ def insert_optional_args(args): new_args = [] default_arg_opts = { + '--autounmask' : ('n',), '--complete-graph' : ('n',), '--deep' : valid_integers, '--depclean-lib-check' : ('n',), @@ -515,6 +516,13 @@ def parse_opts(tmpcmdline, silent=False): longopt_aliases = {"--cols":"--columns", "--skip-first":"--skipfirst"} argument_options = { + + "--autounmask": { + "help" : "automatically unmask packages", + "type" : "choice", + "choices" : ("True", "n") + }, + "--accept-properties": { "help":"temporarily override ACCEPT_PROPERTIES", "action":"store" @@ -735,6 +743,9 @@ def parse_opts(tmpcmdline, silent=False): myoptions, myargs = parser.parse_args(args=tmpcmdline) + if myoptions.autounmask in ("True",): + myoptions.autounmask = True + if myoptions.changed_use is not False: myoptions.reinstall = "changed-use" myoptions.changed_use = False |