summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-06-25 19:34:18 +0000
committerZac Medico <zmedico@gentoo.org>2006-06-25 19:34:18 +0000
commit4304e67493807f9f7332b4231fd33d5c1e0d38d9 (patch)
treeeef07dd7cb84830c5e7f9fdeac16896e8bd14d0a
parent26a1b5c149922a6526e2530c4e1a84385acae25e (diff)
downloadportage-4304e67493807f9f7332b4231fd33d5c1e0d38d9.tar.gz
portage-4304e67493807f9f7332b4231fd33d5c1e0d38d9.tar.bz2
portage-4304e67493807f9f7332b4231fd33d5c1e0d38d9.zip
Remove the help() function.
svn path=/main/trunk/; revision=3656
-rwxr-xr-xbin/emerge9
1 files changed, 2 insertions, 7 deletions
diff --git a/bin/emerge b/bin/emerge
index f14d550ea..2c395af7b 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -335,11 +335,6 @@ def getportageversion(portdir, target_root, profile, chost):
return "Portage " + portage.VERSION +" ("+profilever+", "+gccver+", "+libcver+", "+unameout+")"
-def help():
- # Move all the help stuff out of this file.
- emergehelp.help(myaction,myopts,havecolor)
-
-
def create_depgraph_params(myopts, myaction):
#configure emerge engine parameters
#
@@ -3602,7 +3597,7 @@ if __name__ == "__main__":
settings.profile_path, settings["CHOST"])
sys.exit(0)
elif "--help" in myopts:
- help()
+ emergehelp.help(myaction, myopts, havecolor)
sys.exit(0)
if portage.wheelgid == portage.portage_gid:
@@ -3614,7 +3609,7 @@ if __name__ == "__main__":
print "myopts", myopts
if not myaction and not myfiles and "--resume" not in myopts:
- help()
+ emergehelp.help(myaction, myopts, havecolor)
sys.exit(1)
# check if root user is the current user for the actions where emerge needs this