Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge fix to production.

--HG--
branch : production-0.8
  • Loading branch information...
commit b0e33aa4f85c9cc90040b6a1d9239aad9d360244 2 parents 3611a2b + 6de056d
@bhearsum bhearsum authored
Showing with 24 additions and 22 deletions.
  1. +9 −9 misc.py
  2. +15 −13 process/factory.py
View
18 misc.py
@@ -1371,21 +1371,21 @@ def generateBranchObjects(config, name, secrets=None):
multiargs = {}
+ if pf.get('product_name') == 'b2g':
+ multiargs['multiLocaleScript'] = 'scripts/b2g_desktop_multilocale.py'
+ else:
+ if 'android' in platform:
+ multiargs['multiLocaleScript'] = 'scripts/multil10n.py'
+ if pf.get('multi_config_name'):
+ multiargs['multiLocaleConfig'] = pf['multi_config_name']
+ else:
+ multiargs['multiLocaleConfig'] = 'multi_locale/%s_%s.json' % (name, platform)
if config.get('enable_multi_locale') and pf.get('multi_locale'):
multiargs['multiLocale'] = True
multiargs['multiLocaleMerge'] = config['multi_locale_merge']
multiargs['compareLocalesRepoPath'] = config['compare_locales_repo_path']
multiargs['compareLocalesTag'] = config['compare_locales_tag']
multiargs['mozharnessMultiOptions'] = pf.get('mozharness_multi_options')
- if pf.get('product_name') == 'b2g':
- multiargs['multiLocaleScript'] = 'scripts/b2g_desktop_multilocale.py'
- else:
- if 'android' in platform:
- multiargs['multiLocaleScript'] = 'scripts/multil10n.py'
- if pf.get('multi_config_name'):
- multiargs['multiLocaleConfig'] = pf['multi_config_name']
- else:
- multiargs['multiLocaleConfig'] = 'multi_locale/%s_%s.json' % (name, platform)
create_snippet = config['create_snippet']
View
28 process/factory.py
@@ -849,6 +849,11 @@ def __init__(self, objdir, platform, configRepoPath, configSubDir,
self.gaiaLanguagesScript = gaiaLanguagesScript
self.gaiaL10nRoot = gaiaL10nRoot
self.gaiaL10nBaseDir = WithProperties('%(basedir)s/build-gaia-l10n')
+ self.compareLocalesRepoPath = compareLocalesRepoPath
+ self.compareLocalesTag = compareLocalesTag
+ self.multiLocaleScript = multiLocaleScript
+ self.multiLocaleConfig = multiLocaleConfig
+ self.multiLocaleMerge = multiLocaleMerge
assert len(self.tooltool_url_list) <= 1, "multiple urls not currently supported by tooltool"
@@ -964,11 +969,6 @@ def __init__(self, objdir, platform, configRepoPath, configSubDir,
assert compareLocalesRepoPath and compareLocalesTag
assert mozharnessRepoPath and mozharnessTag
assert multiLocaleScript and multiLocaleConfig
- self.compareLocalesRepoPath = compareLocalesRepoPath
- self.compareLocalesTag = compareLocalesTag
- self.multiLocaleScript = multiLocaleScript
- self.multiLocaleConfig = multiLocaleConfig
- self.multiLocaleMerge = multiLocaleMerge
if mozharnessMultiOptions:
self.mozharnessMultiOptions = mozharnessMultiOptions
else:
@@ -1181,16 +1181,18 @@ def addSourceSteps(self):
))
if self.gaiaLanguagesFile:
languagesFile = '%(basedir)s/build/gaia/' + self.gaiaLanguagesFile
+ cmd = ['python', 'mozharness/%s' % self.gaiaLanguagesScript,
+ '--pull',
+ '--gaia-languages-file', WithProperties(languagesFile),
+ '--gaia-l10n-root', self.gaiaL10nRoot,
+ '--gaia-l10n-base-dir', self.gaiaL10nBaseDir,
+ '--config-file', self.multiLocaleConfig,
+ '--gecko-l10n-root', self.geckoL10nRoot]
+ if self.geckoLanguagesFile:
+ cmd.extend(['--gecko-languages-file', self.geckoLanguagesFile])
self.addStep(MockCommand(
name='clone_gaia_l10n_repos',
- command=['python', 'mozharness/%s' % self.gaiaLanguagesScript,
- '--pull',
- '--gaia-languages-file', WithProperties(languagesFile),
- '--gaia-l10n-root', self.gaiaL10nRoot,
- '--gaia-l10n-base-dir', self.gaiaL10nBaseDir,
- '--config-file', self.multiLocaleConfig,
- '--gecko-l10n-root', self.geckoL10nRoot,
- '--gecko-languages-file', self.geckoLanguagesFile],
+ command=cmd,
env=self.env,
workdir=WithProperties('%(basedir)s'),
haltOnFailure=True,
Please sign in to comment.
Something went wrong with that request. Please try again.