From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 26 Jun 2009 20:10:06 +0000 (-0000)
Subject: Move __init__.py to main.py.
X-Git-Tag: v2.2_rc34~143
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e6b23dd14b7da8f88e2904ca6fbeb0e0efa08eee;p=portage.git

Move __init__.py to main.py.

svn path=/main/trunk/; revision=13698
---

diff --git a/bin/emerge b/bin/emerge
index d3cf24fc8..8ffa6e435 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -26,7 +26,7 @@ def debug_signal(signum, frame):
 signal.signal(signal.SIGUSR1, debug_signal)
 
 try:
-	import _emerge
+	from _emerge.main import emerge_main
 except ImportError:
 	from os import path as osp
 	import sys
@@ -37,7 +37,7 @@ if __name__ == "__main__":
 	import sys
 	from portage.exception import ParseError, PermissionDenied
 	try:
-		retval = _emerge.emerge_main()
+		retval = 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
new file mode 100644
index 000000000..95cbda1ed
--- /dev/null
+++ b/pym/_emerge/__init__.py
@@ -0,0 +1,3 @@
+# Copyright 2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$