From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 1 Jul 2012 20:07:27 +0000 (-0700)
Subject: _quickpkg_dblink: set PYTHONPATH for quickpkg
X-Git-Tag: v2.2.0_alpha115~4
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=77703d4f3660374068c275369670dcfe9c2f4131;p=portage.git

_quickpkg_dblink: set PYTHONPATH for quickpkg
---

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index e5e119536..dd37be005 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -4745,6 +4745,12 @@ class dblink(object):
 			env = dict(self.vartree.settings.items())
 			env["__PORTAGE_INHERIT_VARDB_LOCK"] = "1"
 
+			pythonpath = [x for x in env.get('PYTHONPATH', '').split(":") if x]
+			if not pythonpath or \
+				not os.path.samefile(pythonpath[0], portage._pym_path):
+				pythonpath.insert(0, portage._pym_path)
+			env['PYTHONPATH'] = ":".join(pythonpath)
+
 			quickpkg_proc = SpawnProcess(
 				args=[portage._python_interpreter, quickpkg_binary,
 					"=%s" % (backup_dblink.mycpv,)],