_quickpkg_dblink: set PYTHONPATH for quickpkg
authorZac Medico <zmedico@gentoo.org>
Sun, 1 Jul 2012 20:07:27 +0000 (13:07 -0700)
committerZac Medico <zmedico@gentoo.org>
Sun, 1 Jul 2012 20:07:27 +0000 (13:07 -0700)
pym/portage/dbapi/vartree.py

index e5e1195361ef6fcea9fa894231fb49dcd24209dd..dd37be005993e17f900d93136c3dedbc412df895 100644 (file)
@@ -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,)],