diff options
author | Zac Medico <zmedico@gentoo.org> | 2012-09-02 14:56:22 -0700 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2012-09-02 14:56:22 -0700 |
commit | 50f098aee0282d5294b94c8c3c0074b3126724e6 (patch) | |
tree | ca9078d939793212de3e640034b92285d5cf34d5 /bin/emerge | |
parent | b7d972b4d18ad726c70f35b8026cbd94b2dc3b5f (diff) | |
download | portage-50f098aee0282d5294b94c8c3c0074b3126724e6.tar.gz portage-50f098aee0282d5294b94c8c3c0074b3126724e6.tar.bz2 portage-50f098aee0282d5294b94c8c3c0074b3126724e6.zip |
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.
Diffstat (limited to 'bin/emerge')
-rwxr-xr-x | bin/emerge | 11 |
1 files changed, 4 insertions, 7 deletions
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 |