Gentoo Archives: gentoo-commits

From: "Fabian Groffen (grobian)" <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] portage r14156 - main/branches/prefix/bin
Date: Wed, 26 Aug 2009 20:32:07
Message-Id: E1MgF5m-0007G0-54@stork.gentoo.org
1 Author: grobian
2 Date: 2009-08-26 09:46:57 +0000 (Wed, 26 Aug 2009)
3 New Revision: 14156
4
5 Modified:
6 main/branches/prefix/bin/quickpkg
7 Log:
8 fix quickpkg now os is no longer imported
9
10 Modified: main/branches/prefix/bin/quickpkg
11 ===================================================================
12 --- main/branches/prefix/bin/quickpkg 2009-08-25 05:09:25 UTC (rev 14155)
13 +++ main/branches/prefix/bin/quickpkg 2009-08-26 09:46:57 UTC (rev 14156)
14 @@ -6,11 +6,12 @@
15 import errno, signal, sys
16 from itertools import izip
17
18 -# for an explanation on this logic, see pym/_emerge/__init__.py
19 -if os.environ.__contains__("PORTAGE_PYTHONPATH"):
20 - sys.path.insert(0, os.environ["PORTAGE_PYTHONPATH"])
21 +from os import environ as ose
22 +from os import path as osp
23 +if ose.__contains__("PORTAGE_PYTHONPATH"):
24 + sys.path.insert(0, ose["PORTAGE_PYTHONPATH"])
25 else:
26 - sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(os.path.realpath(__file__))), "pym"))
27 + sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp. realpath(__file__))), "pym"))
28 import portage
29
30 from portage import os