diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-07-28 22:34:59 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-07-28 22:34:59 -0700 |
| commit | eef823e9c368d2feeafc187b1ad00092a5086a12 (patch) | |
| tree | 2bf7af67ee5c9d725053aa20ad33deee30592e00 | |
| parent | 0e622a638fe059aafde079eb552ab8e433510d41 (diff) | |
| download | portage-eef823e9c368d2feeafc187b1ad00092a5086a12.tar.gz portage-eef823e9c368d2feeafc187b1ad00092a5086a12.tar.bz2 portage-eef823e9c368d2feeafc187b1ad00092a5086a12.zip | |
Add a warning message to the --package-moves[=n] docs, noting that
should remain enabled under normal circumstances.
| -rw-r--r-- | man/emerge.1 | 5 | ||||
| -rw-r--r-- | pym/_emerge/help.py | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/man/emerge.1 b/man/emerge.1 index 15d7fcac5..572002d3d 100644 --- a/man/emerge.1 +++ b/man/emerge.1 @@ -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* diff --git a/pym/_emerge/help.py b/pym/_emerge/help.py index 9834c5c54..43e9794ed 100644 --- a/pym/_emerge/help.py +++ b/pym/_emerge/help.py @@ -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() |