summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-05-28 23:27:35 +0000
committerZac Medico <zmedico@gentoo.org>2006-05-28 23:27:35 +0000
commitccdc4071dfc9907634fd8a08dd0a3c8bf71a62f7 (patch)
treefe3724bd87fcdf4fb262dbf171570315fcc1435f /pym/emergehelp.py
parentUpdate the default USE_ORDER setting in the man page. Thanks to jakub for re... (diff)
downloadportage-multirepo-ccdc4071dfc9907634fd8a08dd0a3c8bf71a62f7.tar.gz
portage-multirepo-ccdc4071dfc9907634fd8a08dd0a3c8bf71a62f7.tar.bz2
portage-multirepo-ccdc4071dfc9907634fd8a08dd0a3c8bf71a62f7.zip
Revert patch for r3426 for bug 134466 and add warnings to docs.
svn path=/main/trunk/; revision=3437
Diffstat (limited to 'pym/emergehelp.py')
-rw-r--r--pym/emergehelp.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/pym/emergehelp.py b/pym/emergehelp.py
index 7bb554f3..94f4d673 100644
--- a/pym/emergehelp.py
+++ b/pym/emergehelp.py
@@ -157,7 +157,11 @@ def help(myaction,myopts,havecolor=1):
print " ask whether to continue with the merge or abort. Using --ask is"
print " more efficient than using --pretend and then executing the same"
print " command without --pretend, as dependencies will only need to be"
- print " calculated once."
+ print " calculated once. WARNING: If the \"Enter\" key is pressed at the"
+ print " prompt (with no other input), it is interpreted as acceptance of"
+ print " the first choice. Note that the input buffer is not cleared prior"
+ print " to the prompt, so an accidental press of the \"Enter\" key at any"
+ print " time prior to the prompt will be interpreted as a choice!"
print
print " "+green("--buildpkg")+" ("+green("-b")+" short option)"
print " Tell emerge to build binary packages for all ebuilds processed"