| 1 |
Author: zmedico |
| 2 |
Date: 2008-07-04 00:46:07 +0000 (Fri, 04 Jul 2008) |
| 3 |
New Revision: 10919 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/bin/portageq |
| 7 |
Log: |
| 8 |
Import portage before trying to access portage.exception for exception |
| 9 |
handling. |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/trunk/bin/portageq |
| 13 |
=================================================================== |
| 14 |
--- main/trunk/bin/portageq 2008-07-04 00:11:03 UTC (rev 10918) |
| 15 |
+++ main/trunk/bin/portageq 2008-07-04 00:46:07 UTC (rev 10919) |
| 16 |
@@ -475,14 +475,15 @@ |
| 17 |
os.environ["ROOT"] = sys.argv[2] |
| 18 |
|
| 19 |
global portage |
| 20 |
+ try: |
| 21 |
+ import portage |
| 22 |
+ except ImportError: |
| 23 |
+ from os import path as osp |
| 24 |
+ sys.path.insert(0, osp.join(osp.dirname( |
| 25 |
+ osp.dirname(osp.realpath(__file__))), "pym")) |
| 26 |
+ import portage |
| 27 |
|
| 28 |
try: |
| 29 |
- try: |
| 30 |
- import portage |
| 31 |
- except ImportError: |
| 32 |
- from os import path as osp |
| 33 |
- sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym")) |
| 34 |
- import portage |
| 35 |
if uses_root: |
| 36 |
sys.argv[2] = portage.settings["ROOT"] |
| 37 |
retval = function(sys.argv[2:]) |
| 38 |
|
| 39 |
-- |
| 40 |
gentoo-commits@l.g.o mailing list |
Archives