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/quickpkg | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'bin/quickpkg') diff --git a/bin/quickpkg b/bin/quickpkg index 76259c5c1..a6439e282 100755 --- a/bin/quickpkg +++ b/bin/quickpkg @@ -11,13 +11,10 @@ import signal import sys import tarfile -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 xpak from portage.dbapi.dep_expand import dep_expand -- cgit v1.2.3-1-g7c22