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