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/help.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/help.py')
| -rw-r--r-- | pym/_emerge/help.py | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/pym/_emerge/help.py b/pym/_emerge/help.py index f5ff7a367..4334bcbdb 100644 --- a/pym/_emerge/help.py +++ b/pym/_emerge/help.py @@ -331,6 +331,14 @@ def help(myopts, havecolor=1): for line in wrap(desc, desc_width): print(desc_indent + line) print() + print(" " + green("--autounmask-keep-masks") + " [ %s | %s ]" % \ + (turquoise("y"), turquoise("n"))) + desc = "If --autounmask is enabled, no changes to " + \ + "package.unmask will be created. This leads to unsatisfied " + \ + "dependencies if no other solution exists." + for line in wrap(desc, desc_width): + print(desc_indent + line) + print() print(" " + green("--autounmask-write") + " [ %s | %s ]" % \ (turquoise("y"), turquoise("n"))) desc = "If --autounmask is enabled, changes are written " + \ |