From b1872f1d9287545fcd10ff58b810a6281ad0e82b Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 21 Jun 2007 05:47:59 +0000 Subject: default --help should be usable, so make the extended output require --verbose (trunk r6262:6264) svn path=/main/branches/2.1.2/; revision=6906 --- pym/emergehelp.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'pym') diff --git a/pym/emergehelp.py b/pym/emergehelp.py index cc2dc0bbb..69c8453e9 100644 --- a/pym/emergehelp.py +++ b/pym/emergehelp.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 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 + print " For more help try 'emerge --help --verbose' or consult the man page." elif not myaction: shorthelp() print -- cgit v1.2.3-1-g7c22