| 1 |
Author: grobian |
| 2 |
Date: 2009-08-24 10:12:18 +0000 (Mon, 24 Aug 2009) |
| 3 |
New Revision: 14150 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/prefix/bin/ebuild |
| 7 |
Log: |
| 8 |
fix portage meltdown due to wrong order of imports |
| 9 |
|
| 10 |
Modified: main/branches/prefix/bin/ebuild |
| 11 |
=================================================================== |
| 12 |
--- main/branches/prefix/bin/ebuild 2009-08-24 10:05:03 UTC (rev 14149) |
| 13 |
+++ main/branches/prefix/bin/ebuild 2009-08-24 10:12:18 UTC (rev 14150) |
| 14 |
@@ -27,14 +27,6 @@ |
| 15 |
import optparse |
| 16 |
import os |
| 17 |
|
| 18 |
-# for an explanation on this logic, see pym/_emerge/__init__.py |
| 19 |
-from os import environ as ose |
| 20 |
-from os import path as osp |
| 21 |
-if ose.__contains__("PORTAGE_PYTHONPATH"): |
| 22 |
- sys.path.insert(0, ose["PORTAGE_PYTHONPATH"]) |
| 23 |
-else: |
| 24 |
- sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp. realpath(__file__))), "pym")) |
| 25 |
- |
| 26 |
description = "See the ebuild(1) man page for more info" |
| 27 |
usage = "Usage: ebuild <ebuild file> <command> [command] ..." |
| 28 |
parser = optparse.OptionParser(description=description, usage=usage) |
| 29 |
@@ -63,6 +55,14 @@ |
| 30 |
os.environ["FEATURES"] = os.environ.get("FEATURES", "") + " -noauto" |
| 31 |
|
| 32 |
os.environ["PORTAGE_CALLER"]="ebuild" |
| 33 |
+# for an explanation on this logic, see pym/_emerge/__init__.py |
| 34 |
+from os import environ as ose |
| 35 |
+from os import path as osp |
| 36 |
+if ose.__contains__("PORTAGE_PYTHONPATH"): |
| 37 |
+ sys.path.insert(0, ose["PORTAGE_PYTHONPATH"]) |
| 38 |
+else: |
| 39 |
+ sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp. realpath(__file__))), "pym")) |
| 40 |
+import portage |
| 41 |
|
| 42 |
from portage import os |
Archives