| 1 |
commit: a0d6d04ad4a5bd52b7ed3639bd71370fe986024d |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Oct 2 18:47:21 2014 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Oct 2 18:47:21 2014 +0000 |
| 6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=a0d6d04a |
| 7 |
|
| 8 |
portageq: fix backtrace due to changed variable |
| 9 |
|
| 10 |
--- |
| 11 |
bin/portageq | 8 +++++--- |
| 12 |
1 file changed, 5 insertions(+), 3 deletions(-) |
| 13 |
|
| 14 |
diff --git a/bin/portageq b/bin/portageq |
| 15 |
index 7b9e177..d383d42 100755 |
| 16 |
--- a/bin/portageq |
| 17 |
+++ b/bin/portageq |
| 18 |
@@ -24,11 +24,13 @@ import os |
| 19 |
import types |
| 20 |
|
| 21 |
# for an explanation on this logic, see pym/_emerge/__init__.py |
| 22 |
+# this differs from master, we need to revisit this when we can install |
| 23 |
+# using distutils, like master |
| 24 |
if os.environ.__contains__("PORTAGE_PYTHONPATH"): |
| 25 |
- pym_path = os.environ["PORTAGE_PYTHONPATH"] |
| 26 |
+ pym_paths = [ os.environ["PORTAGE_PYTHONPATH"] ] |
| 27 |
else: |
| 28 |
- pym_path = os.path.join(os.path.dirname( |
| 29 |
- os.path.dirname(os.path.realpath(__file__))), "pym") |
| 30 |
+ pym_paths = [ os.path.join(os.path.dirname( |
| 31 |
+ os.path.dirname(os.path.realpath(__file__))), "pym") ] |
| 32 |
# Avoid sandbox violations after Python upgrade. |
| 33 |
if os.environ.get("SANDBOX_ON") == "1": |
| 34 |
sandbox_write = os.environ.get("SANDBOX_WRITE", "").split(":") |
Archives