Add a warning message to the --package-moves[=n] docs, noting that
authorZac Medico <zmedico@gentoo.org>
Thu, 29 Jul 2010 05:34:59 +0000 (22:34 -0700)
committerZac Medico <zmedico@gentoo.org>
Thu, 29 Jul 2010 05:34:59 +0000 (22:34 -0700)
should remain enabled under normal circumstances.

man/emerge.1
pym/_emerge/help.py

index 15d7fcac527bd3cdc7a6a2940a3a512b444829eb..572002d3d7fdc0877c6a10cc4244407838d02e36 100644 (file)
@@ -470,7 +470,10 @@ specified, not the packages themselves.
 .TP
 .BR "\-\-package\-moves[=n]"
 Perform package moves when necessary. This option
-is enabled by default.
+is enabled by default. \fBWARNING:\fR This option
+should remain enabled under normal circumstances.
+Do not disable it unless you know what you are
+doing.
 .TP
 .BR "\-\-pretend " (\fB\-p\fR)
 Instead of actually performing the merge, simply display what *would*
index 9834c5c544031018d0408322474c9a60de48b1a4..43e9794eddbbba1fdcbbf323323ddec6298ff22b 100644 (file)
@@ -517,7 +517,10 @@ def help(myopts, havecolor=1):
                print()
                print("       " + green("--package-moves") + "[=%s]" % turquoise("n"))
                desc = "Perform package moves when necessary. This option " + \
-                       "is enabled by default."
+                       "is enabled by default. WARNING: This option " + \
+                       "should remain enabled under normal circumstances. " + \
+                       "Do not disable it unless you know what you are " + \
+                       "doing."
                for line in wrap(desc, desc_width):
                        print(desc_indent + line)
                print()