| 1 |
commit: 77703d4f3660374068c275369670dcfe9c2f4131 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jul 1 20:07:27 2012 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jul 1 20:07:27 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=77703d4f |
| 7 |
|
| 8 |
_quickpkg_dblink: set PYTHONPATH for quickpkg |
| 9 |
|
| 10 |
--- |
| 11 |
pym/portage/dbapi/vartree.py | 6 ++++++ |
| 12 |
1 files changed, 6 insertions(+), 0 deletions(-) |
| 13 |
|
| 14 |
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py |
| 15 |
index e5e1195..dd37be0 100644 |
| 16 |
--- a/pym/portage/dbapi/vartree.py |
| 17 |
+++ b/pym/portage/dbapi/vartree.py |
| 18 |
@@ -4745,6 +4745,12 @@ class dblink(object): |
| 19 |
env = dict(self.vartree.settings.items()) |
| 20 |
env["__PORTAGE_INHERIT_VARDB_LOCK"] = "1" |
| 21 |
|
| 22 |
+ pythonpath = [x for x in env.get('PYTHONPATH', '').split(":") if x] |
| 23 |
+ if not pythonpath or \ |
| 24 |
+ not os.path.samefile(pythonpath[0], portage._pym_path): |
| 25 |
+ pythonpath.insert(0, portage._pym_path) |
| 26 |
+ env['PYTHONPATH'] = ":".join(pythonpath) |
| 27 |
+ |
| 28 |
quickpkg_proc = SpawnProcess( |
| 29 |
args=[portage._python_interpreter, quickpkg_binary, |
| 30 |
"=%s" % (backup_dblink.mycpv,)], |
Archives