Bug 1262760 - Use the objdir's virtualenv's python executable. r=jlund
☠☠ backed out by c8883ca15b03 ☠ ☠
authorEdmund Wong <ewong@pw-wspx.org>
Mon, 09 May 2016 18:47:00 +0200 (2016-05-09)
changeset 4876 a15cf826c0cb2facb526acdc568aac416c170733
parent 4871 5c95600040893bc1c932706798fc4e6afa49cb88
child 4877 225bde66e1d53a0ae33dd3323b469e644fc9aa6d
child 4878 efdb41734f8bc9d3c65d5994c775e51f6eb99c80
push id4114
push useraleth@instantbird.org
push dateTue, 10 May 2016 10:29:47 +0000 (2016-05-10)
reviewersjlund
bugs1262760
Bug 1262760 - Use the objdir's virtualenv's python executable. r=jlund
process/factory.py
--- a/process/factory.py
+++ b/process/factory.py
@@ -1372,17 +1372,18 @@ class MercurialBuildFactory(MozillaBuild
             printconfig_env = self.env.copy()
             printconfig_env.update({'TOOLTOOL_DIR': WithProperties('%(basedir)s/build')})
             del printconfig_env['MOZ_OBJDIR']
             printconfig_workdir = WithProperties('%(basedir)s/build/' + self.objdir)
             # hax https://bugzilla.mozilla.org/show_bug.cgi?id=1232466#c10
             if self.platform.startswith('win'):
                 python = ['c:/mozilla-build/python27/python', '-u']
             else:
-                python = ['/tools/buildbot/bin/python']
+                python = [WithProperties('%(basedir)s/' +
+                          '%s/_virtualenv/bin/python' % self.absMozillaObjDir)]
             if self.mozillaSrcDir:
                 machPath = '%(basedir)s/build/mozilla/mach'
             else:
                 machPath = '%(basedir)s/build/mach'
             # we need abs paths because we are in a non relative workdir
             printconfig_base_command = python + [
                 WithProperties(machPath), 'python',
                 WithProperties('%(basedir)s/build' + '%s/config/printconfigsetting.py' % self.mozillaSrcDir),
@@ -1669,17 +1670,18 @@ class MercurialBuildFactory(MozillaBuild
         printconfig_env = self.env.copy()
         printconfig_env.update({'TOOLTOOL_DIR': WithProperties('%(basedir)s/build')})
         del printconfig_env['MOZ_OBJDIR']
         printconfig_workdir = WithProperties('%(basedir)s/build/' + self.objdir)
         # hax https://bugzilla.mozilla.org/show_bug.cgi?id=1232466#c10
         if self.platform.startswith('win'):
             python = ['c:/mozilla-build/python27/python', '-u']
         else:
-            python = ['/tools/buildbot/bin/python']
+            python = [WithProperties('%(basedir)s/' +
+                      '%s/_virtualenv/bin/python' % self.absMozillaObjDir)]
         if self.mozillaSrcDir:
             machPath = '%(basedir)s/build/mozilla/mach'
         else:
             machPath = '%(basedir)s/build/mach'
         # we need abs paths because we are in a non relative workdir
         printconfig_base_command = python + [
             WithProperties(machPath), 'python',
             WithProperties('%(basedir)s/build' + '%s/config/printconfigsetting.py' % self.mozillaSrcDir),
@@ -2179,17 +2181,18 @@ class NightlyBuildFactory(MercurialBuild
         printconfig_env = self.env.copy()
         printconfig_env.update({'TOOLTOOL_DIR': WithProperties('%(basedir)s/build')})
         del printconfig_env['MOZ_OBJDIR']
         printconfig_workdir = WithProperties('%(basedir)s/build/' + self.objdir)
         # hax https://bugzilla.mozilla.org/show_bug.cgi?id=1232466#c10
         if self.platform.startswith('win'):
             python = ['c:/mozilla-build/python27/python', '-u']
         else:
-            python = ['/tools/buildbot/bin/python']
+            python = [WithProperties('%(basedir)s/' +
+                      '%s/_virtualenv/bin/python' % self.absMozillaObjDir)]
         if self.mozillaSrcDir:
             machPath = '%(basedir)s/build/mozilla/mach'
         else:
             machPath = '%(basedir)s/build/mach'
         # we need abs paths because we are in a non relative workdir
         printconfig_base_command = python + [
             WithProperties(machPath), 'python',
             # abs*Dir attrs lie. they are not absolute paths
@@ -3578,17 +3581,18 @@ class NightlyRepackFactory(BaseRepackFac
         printconfig_env = self.env.copy()
         printconfig_env.update({'TOOLTOOL_DIR': WithProperties('%(basedir)s/build')})
         del printconfig_env['MOZ_OBJDIR']
         printconfig_workdir = WithProperties('%(basedir)s/build/' + self.objdir)
         # hax https://bugzilla.mozilla.org/show_bug.cgi?id=1232466#c10
         if self.platform.startswith('win'):
             python = ['c:/mozilla-build/python27/python', '-u']
         else:
-            python = ['/tools/buildbot/bin/python']
+            python = [WithProperties('%(basedir)s/' +
+                      '%s/_virtualenv/bin/python' % self.absMozillaObjDir)]
         if self.mozillaSrcDir:
             machPath = '%(basedir)s/build/mozilla/mach'
         else:
             machPath = '%(basedir)s/build/mach'
         # we need abs paths because we are in a non relative workdir
         printconfig_base_command = python + [
             WithProperties(machPath), 'python',
             # abs*Dir attrs lie. they are not absolute paths