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/archive-conf | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'bin/archive-conf') diff --git a/bin/archive-conf b/bin/archive-conf index 797866817..af34db628 100755 --- a/bin/archive-conf +++ b/bin/archive-conf @@ -1,5 +1,5 @@ #!/usr/bin/python -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # @@ -12,12 +12,11 @@ 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 import dispatch_conf -- cgit v1.2.3-65-gdbad