Document ** keyword for --autounmask-keep-masks.
authorZac Medico <zmedico@gentoo.org>
Mon, 19 Sep 2011 16:03:24 +0000 (09:03 -0700)
committerZac Medico <zmedico@gentoo.org>
Mon, 19 Sep 2011 16:03:24 +0000 (09:03 -0700)
man/emerge.1
pym/_emerge/help.py

index cf7b0e2da13ef65d0a9ff1dc7107b52cfbf37529..72b556966ee19c038f99d719873fe52927cd48df 100644 (file)
@@ -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
index 4334bcbdb13f0ba30a6bc24681c2ac276d1574e8..e6828c0f4cc68d8a1d3fba427459c1e3d55f2334 100644 (file)
@@ -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)