Bug 1372482 - linux 55.0 repack betas are broken in comparing locales because due to missing python executable.r=rail a=testing FENNEC_55_0b1_BUILD2 FENNEC_55_0b1_RELEASE
authorMihai Tabara <mtabara@mozilla.com>
Tue, 13 Jun 2017 13:23:35 +0100
changeset 598204 e8dd9736241ea1989feaf3c85a71593c8a6f3bbb
parent 598203 7421b6df2ce2f798289ea29662f08d23a0c0d18d
child 598205 979d797835ad026609dc231b893abad6f5863d60
push id65160
push userbmo:flyinggrub@gmail.com
push dateWed, 21 Jun 2017 15:17:56 +0000
reviewersrail, testing
bugs1372482
milestone55.0
Bug 1372482 - linux 55.0 repack betas are broken in comparing locales because due to missing python executable.r=rail a=testing MozReview-Commit-ID: JZ8LRhA6m74
testing/mozharness/mozharness/mozilla/l10n/locales.py
--- a/testing/mozharness/mozharness/mozilla/l10n/locales.py
+++ b/testing/mozharness/mozharness/mozilla/l10n/locales.py
@@ -144,17 +144,23 @@ class LocalesMixin(ChunkingMixin):
         return locales
 
     def run_compare_locales(self, locale, halt_on_failure=False):
         dirs = self.query_abs_dirs()
         env = self.query_l10n_env()
         compare_locales_error_list = list(PythonErrorList)
         self.rmtree(dirs['abs_merge_dir'])
         self.mkdir_p(dirs['abs_merge_dir'])
-        command = [sys.executable, 'mach', 'compare-locales',
+        python = sys.executable
+        # A mock environment is a special case, the system python isn't
+        # available there
+        if 'mock_target' in self.config:
+            python = 'python2.7'
+
+        command = [python, 'mach', 'compare-locales',
                    '--merge-dir', dirs['abs_merge_dir'],
                    '--l10n-ini', os.path.join(dirs['abs_locales_src_dir'], 'l10n.ini'),
                    '--l10n-base', dirs['abs_l10n_dir'], locale]
         self.info("*** BEGIN compare-locales %s" % locale)
         status = self.run_command(command,
                                   halt_on_failure=halt_on_failure,
                                   env=env,
                                   cwd=dirs['abs_mozilla_dir'],