Permalink
Browse files

bug 685253 - fix broken multilocale build due to lack of buildbot-con…

…figs. r=rail

--HG--
branch : production-0.8
  • Loading branch information...
1 parent 0bad034 commit 8c65d60f888fb05a1897bdddeccf2f7dee70ce11 @escapewindow escapewindow committed Sep 8, 2011
Showing with 12 additions and 3 deletions.
  1. +12 −3 process/factory.py
View
@@ -633,6 +633,7 @@ def __init__(self, env, objdir, platform, configRepoPath, configSubDir,
mozharnessTag='default',
multiLocaleScript=None,
multiLocaleConfig=None,
+ mozharnessMultiOptions=None,
**kwargs):
MozillaBuildFactory.__init__(self, **kwargs)
@@ -822,6 +823,12 @@ def __init__(self, env, objdir, platform, configRepoPath, configSubDir,
self.multiLocaleScript = multiLocaleScript
self.multiLocaleConfig = multiLocaleConfig
self.multiLocaleMerge = multiLocaleMerge
+ if mozharnessMultiOptions:
+ self.mozharnessMultiOptions = mozharnessMultiOptions
+ else:
+ self.mozharnessMultiOptions = ['--only-pull-locale-source',
+ '--only-add-locales',
+ '--only-package-multi']
self.addMultiLocaleRepoSteps()
@@ -1478,9 +1485,7 @@ def addUploadSteps(self, pkgArgs=None, pkgTestArgs=None):
'--config-file', self.multiLocaleConfig]
if self.multiLocaleMerge:
cmd.append('--merge-locales')
- cmd.extend(['--only-pull-locale-source',
- '--only-add-locales',
- '--only-package-multi'])
+ cmd.extend(self.mozharnessMultiOptions)
self.addStep(ShellCommand(
name='mozharness_multilocale',
command=cmd,
@@ -2610,6 +2615,10 @@ def __init__(self, env, version, buildNumber, brandName=None,
if usePrettyNames:
env['MOZ_PKG_PRETTYNAMES'] = '1'
env['MOZ_PKG_VERSION'] = version
+ kwargs['mozharnessMultiOptions'] = ['--only-pull-build-source',
+ '--only-pull-locale-source',
+ '--only-add-locales',
+ '--only-package-multi']
MercurialBuildFactory.__init__(self, env=env, **kwargs)
def addFilePropertiesSteps(self, filename=None, directory=None,

0 comments on commit 8c65d60

Please sign in to comment.