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/regenworld | |
| 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/regenworld')
| -rwxr-xr-x | bin/regenworld | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/bin/regenworld b/bin/regenworld index 3199fdf90..a2833445a 100755 --- a/bin/regenworld +++ b/bin/regenworld @@ -1,17 +1,14 @@ #!/usr/bin/python -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 from __future__ import print_function import sys -try: - import portage -except ImportError: - from os import path as osp - sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym")) - import portage - +from os import path as osp +pym_path = osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym") +sys.path.insert(0, pym_path) +import portage from portage import os from portage._sets.files import StaticFileSet, WorldSelectedSet |