From: Marius Mauch <genone@gentoo.org>
Date: Sat, 17 Feb 2007 11:21:13 +0000 (-0000)
Subject: For full backwards compat (with symlinks or other weird stuff) import everything... 
X-Git-Tag: v2.2_pre1~1697
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=cea1466f62fc107c6ecba1cd94821cc4475970ad;p=portage.git

For full backwards compat (with symlinks or other weird stuff) import everything into the main namespace

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

diff --git a/bin/emerge b/bin/emerge
index d6e7c64d5..1190780c3 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -1,12 +1,12 @@
 #!/usr/bin/python
 
 try:
-	import emerge
+	from emerge import *
 except ImportError:
 	from os import path as osp
 	sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym"))
-	import emerge
+	from emerge import *
 
 if __name__ == "__main__":
 	import sys
-	sys.exit(emerge.emerge_main())
+	sys.exit(emerge_main())