From 50f098aee0282d5294b94c8c3c0074b3126724e6 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 2 Sep 2012 14:56:22 -0700 Subject: Unconditionally insert our pym dir in sys.path. This is especially necessary when running in prefix mode, since sys.path may contain the path for a different version of portage. --- bin/emerge | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'bin/emerge') diff --git a/bin/emerge b/bin/emerge index a9a56432c..f618068c3 100755 --- a/bin/emerge +++ b/bin/emerge @@ -35,13 +35,10 @@ else: signal.signal(debug_signum, debug_signal) -try: - from _emerge.main import emerge_main -except ImportError: - from os import path as osp - import sys - sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym")) - from _emerge.main import emerge_main +from os import path as osp +pym_path = osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym") +sys.path.insert(0, pym_path) +from _emerge.main import emerge_main if __name__ == "__main__": import sys -- cgit v1.2.3-1-g7c22