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 4784062a9ea4b9b796e03c839ceb739871e22bcc..291ad199ea2f5ca43652ce6431d3a358900c9669 100644 (file)
--- 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