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/ebuild | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'bin/ebuild') diff --git a/bin/ebuild b/bin/ebuild index 65e5bef63..a21ef648a 100755 --- a/bin/ebuild +++ b/bin/ebuild @@ -64,13 +64,10 @@ parser.add_option("--skip-manifest", help="skip all manifest checks", opts, pargs = parser.parse_args(args=sys.argv[1:]) -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 portage.dep._internal_warnings = True from portage import os from portage import _encodings -- cgit v1.2.3-1-g7c22