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/help.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/help.py')
| -rw-r--r-- | pym/_emerge/help.py | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/pym/_emerge/help.py b/pym/_emerge/help.py index 43e9794ed..72bb56d41 100644 --- a/pym/_emerge/help.py +++ b/pym/_emerge/help.py @@ -291,6 +291,17 @@ def help(myopts, havecolor=1): "EMERGE_DEFAULT_OPTS variable." for line in wrap(desc, desc_width): print(desc_indent + line) + print() + print(" " + green("--autounmask") + "[=%s]" % turquoise("n")) + desc = "Automatically unmask packages. If any configuration " + \ + "changes are required, then they will be displayed " + \ + "after the merge list and emerge will immediately " + \ + "abort. If the displayed configuration changes are " + \ + "satisfactory, you should copy and paste them into " + \ + "the specified configuration file(s). Currently, " + \ + "this only works for unstable KEYWORDS masks." + for line in wrap(desc, desc_width): + print(desc_indent + line) print() print(" " + green("--backtrack") + " " + turquoise("COUNT")) desc = "Specifies an integer number of times to backtrack if " + \ |