From: Fabian Groffen <grobian@gentoo.org>
Date: Mon, 26 Feb 2007 20:54:10 +0000 (-0000)
Subject: Merged from trunk 5976:5977
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=9dbe81c8206048561970f857dde79e816d107dfe;p=portage.git

Merged from trunk 5976:5977

Make emerge importable again without relying on module search path order
(genone) (prefix: let's take emerge from prefix)


svn path=/main/branches/prefix/; revision=6075
---

diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py
index 4784062a9..291ad199e 100644
--- a/pym/emerge/__init__.py
+++ b/pym/emerge/__init__.py
@@ -1,2 +1,5 @@
-# I have no clue what to put here, but putting this here, seems to work
-# already...
+# To emulate old behavior, import everything from the normal emerge script
+import imp
+emerge = imp.load_source("emerge", "@DOMAIN_PREFIX@/usr/bin/emerge")
+from emerge import *
+del emerge, imp