summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2007-03-22 07:37:54 +0000
committerMike Frysinger <vapier@gentoo.org>2007-03-22 07:37:54 +0000
commitbbca971c60e36244ff7721885010473287b9caae (patch)
treec96c4b4f526618bad6e30f96b29ed968f001774d
parent35cbeb071cf22e5b37c4b0c02bda948848faa962 (diff)
downloadportage-bbca971c60e36244ff7721885010473287b9caae.tar.gz
portage-bbca971c60e36244ff7721885010473287b9caae.tar.bz2
portage-bbca971c60e36244ff7721885010473287b9caae.zip
default --help should be usable, so make the extended output require --verbose
svn path=/main/trunk/; revision=6263
-rw-r--r--pym/emerge/help.py9
1 files changed, 3 insertions, 6 deletions
diff --git a/pym/emerge/help.py b/pym/emerge/help.py
index 60ae52c2d..d72a1a0ca 100644
--- a/pym/emerge/help.py
+++ b/pym/emerge/help.py
@@ -1,4 +1,4 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -7,8 +7,7 @@ import os,sys
from portage.output import bold, turquoise, green
def shorthelp():
- print
- print
+ print bold("emerge:")+" the other white meat (command-line interface to the Portage system)"
print bold("Usage:")
print " "+turquoise("emerge")+" [ "+green("options")+" ] [ "+green("action")+" ] [ "+turquoise("ebuildfile")+" | "+turquoise("tbz2file")+" | "+turquoise("dependency")+" ] [ ... ]"
print " "+turquoise("emerge")+" [ "+green("options")+" ] [ "+green("action")+" ] < "+turquoise("system")+" | "+turquoise("world")+" >"
@@ -20,14 +19,12 @@ def shorthelp():
print " ["+green("--nospinner")+"]"
print " [ "+green("--deep")+" ] [" + green("--with-bdeps")+" < " + turquoise("y") + " | "+ turquoise("n")+" > ]"
print bold("Actions:")+" [ "+green("--clean")+" | "+green("--depclean")+" | "+green("--prune")+" | "+green("--regen")+" | "+green("--search")+" | "+green("--unmerge")+" ]"
- print
def help(myaction,myopts,havecolor=1):
- if not myaction and ("--help" not in myopts):
+ if not myaction and ("--verbose" not in myopts):
shorthelp()
print
print " For more help try 'emerge --help' or consult the man page."
- print
elif not myaction:
shorthelp()
print