From d36be695ea48025ba195deb82f51846aee2254ec Mon Sep 17 00:00:00 2001 From: Sebastian Luther Date: Mon, 19 Sep 2011 07:32:08 -0700 Subject: 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. --- pym/_emerge/help.py | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'pym/_emerge/help.py') 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 " + \ -- cgit v1.2.3-1-g7c22