From 61ba908c5ba3f8db4b8f6adeaccba2321438aacd Mon Sep 17 00:00:00 2001
From: Fabian Groffen <grobian@gentoo.org>
Date: Sun, 21 Oct 2007 12:22:39 +0000
Subject: [PATCH]    Merged from trunk 8141:8142  (Manually applied)

   | 8142    | Move the emerge module to _emerge to make it private since   |
   | zmedico | it's mostly unsuitable for api consumers at this time.       |

svn path=/main/branches/prefix/; revision=8208
---
 bin/emerge              | 6 +++---
 pym/_emerge/__init__.py | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/bin/emerge b/bin/emerge
index 13bc5f394..b1c9e748a 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -4,18 +4,18 @@
 # $Id$
 
 try:
-	from emerge import *
+	import _emerge
 except ImportError:
 	from os import path as osp
 	import sys
 	sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym"))
-	from emerge import *
+	import _emerge
 
 if __name__ == "__main__":
 	import sys
 	from portage.exception import PermissionDenied
 	try:
-		retval = emerge_main()
+		retval = _emerge.emerge_main()
 	except PermissionDenied, e:
 		sys.stderr.write("Permission denied: '%s'\n" % str(e))
 		sys.exit(e.errno)
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 3308932db..ef3a42dc8 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -33,7 +33,7 @@ del os.environ["PORTAGE_LEGACY_GLOBALS"]
 from portage import digraph, portdbapi
 from portage.const import NEWS_LIB_PATH, CACHE_PATH, PRIVATE_PATH, USER_CONFIG_PATH, GLOBAL_CONFIG_PATH
 
-import emerge.help
+import _emerge.help
 import portage.xpak, commands, errno, re, socket, time, types
 from portage.output import blue, bold, colorize, darkblue, darkgreen, darkred, green, \
 	havecolor, nc_len, nocolor, red, teal, turquoise, white, xtermTitle, \
@@ -6767,7 +6767,7 @@ def emerge_main():
 			trees[settings["ROOT"]]["vartree"].dbapi)
 		sys.exit(0)
 	elif "--help" in myopts:
-		emerge.help.help(myaction, myopts, portage.output.havecolor)
+		_emerge.help.help(myaction, myopts, portage.output.havecolor)
 		sys.exit(0)
 
 	if "--debug" in myopts:
@@ -6775,7 +6775,7 @@ def emerge_main():
 		print "myopts", myopts
 
 	if not myaction and not myfiles and "--resume" not in myopts:
-		emerge.help.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
-- 
2.26.2