For full backwards compat (with symlinks or other weird stuff) import everything...

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

diff --git a/bin/emerge b/bin/emerge
index d6e7c64d56592dcef9f759440ffcad4f39448f8d..1190780c31f5c431a32b86ee7be7be91566783c3 100755 (executable)
--- 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())