From 72ef29a6adaa053cf2d538349a3a1555909ed697 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 19 Sep 2011 09:03:24 -0700 Subject: [PATCH] Document ** keyword for --autounmask-keep-masks. --- man/emerge.1 | 2 +- pym/_emerge/help.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/man/emerge.1 b/man/emerge.1 index cf7b0e2da..72b556966 100644 --- a/man/emerge.1 +++ b/man/emerge.1 @@ -310,7 +310,7 @@ will be written. With this option, \'>=\' operators will be used whenever possible. .TP .BR "\-\-autounmask\-keep\-masks [ y | n ]" -If \-\-autounmask is enabled, no changes to package.unmask +If \-\-autounmask is enabled, no package.unmask or ** keyword changes will be created. This leads to unsatisfied dependencies if no other solution exists. .TP diff --git a/pym/_emerge/help.py b/pym/_emerge/help.py index 4334bcbdb..e6828c0f4 100644 --- a/pym/_emerge/help.py +++ b/pym/_emerge/help.py @@ -333,8 +333,8 @@ def help(myopts, havecolor=1): 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 " + \ + desc = "If --autounmask is enabled, no package.unmask or ** keyword " + \ + "changes will be created. This leads to unsatisfied " + \ "dependencies if no other solution exists." for line in wrap(desc, desc_width): print(desc_indent + line) -- 2.26.2