diff options
| author | Marius Mauch <genone@gentoo.org> | 2007-02-08 13:39:03 +0000 |
|---|---|---|
| committer | Marius Mauch <genone@gentoo.org> | 2007-02-08 13:39:03 +0000 |
| commit | c17adabeb018c9f425a1e97ac79f16514afa2381 (patch) | |
| tree | 9fb6fa57f2e55bb737e926e6fb34e3cc723c7899 /bin/emerge | |
| parent | 783001ec079bac46e51ab2ce7969d117f8af05fc (diff) | |
| download | portage-c17adabeb018c9f425a1e97ac79f16514afa2381.tar.gz portage-c17adabeb018c9f425a1e97ac79f16514afa2381.tar.bz2 portage-c17adabeb018c9f425a1e97ac79f16514afa2381.zip | |
Create namespace for emerge
svn path=/main/trunk/; revision=5931
Diffstat (limited to 'bin/emerge')
| -rwxr-xr-x | bin/emerge | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/bin/emerge b/bin/emerge index 952f83397..bb8bf5b12 100755 --- a/bin/emerge +++ b/bin/emerge @@ -32,7 +32,8 @@ del os.environ["PORTAGE_LEGACY_GLOBALS"] from portage import digraph, portdbapi from portage.const import NEWS_LIB_PATH -import portage.emergehelp, portage.xpak, commands, errno, re, socket, time, types +import emerge.help +import portage.xpak, commands, errno, re, socket, time, types import output from portage.output import blue, bold, colorize, darkblue, darkgreen, darkred, green, \ havecolor, nc_len, nocolor, red, teal, turquoise, white, xtermTitle, \ @@ -5210,7 +5211,7 @@ def emerge_main(): trees[settings["ROOT"]]["vartree"].dbapi) sys.exit(0) elif "--help" in myopts: - portage.emergehelp.help(myaction, myopts, portage.output.havecolor) + emerge.help.help(myaction, myopts, portage.output.havecolor) sys.exit(0) if portage.wheelgid == portage.portage_gid: @@ -5222,7 +5223,7 @@ def emerge_main(): print "myopts", myopts if not myaction and not myfiles and "--resume" not in myopts: - portage.emergehelp.help(myaction, myopts, portage.output.havecolor) + emerge.help.help(myaction, myopts, portage.output.havecolor) sys.exit(1) # check if root user is the current user for the actions where emerge needs this |