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/dispatch-conf | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'bin/dispatch-conf') diff --git a/bin/dispatch-conf b/bin/dispatch-conf index 35979dbb2..e5f768056 100755 --- a/bin/dispatch-conf +++ b/bin/dispatch-conf @@ -16,14 +16,10 @@ from __future__ import print_function from stat import ST_GID, ST_MODE, ST_UID from random import random import atexit, re, shutil, stat, 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 from portage import _unicode_decode -- cgit v1.2.3-1-g7c22