Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merging from default

changeset:   1788:855428250f00
tag:         tip
parent:      1784:c13f0dc93279
user:        Aki Sasaki <asasaki@mozilla.com>
date:        Fri Sep 09 17:43:12 2011 -0700
summary:     bug 679153 - multilocale repo configs should be override-friendly. r=lsblakk

--HG--
branch : production-0.8
  • Loading branch information...
commit 0d8776f65d683f9eb466bcbc2e4b6c111768a7b9 2 parents 3ef69bb + f1e7c77
@ccooper ccooper authored
Showing with 4 additions and 5 deletions.
  1. +0 −4 process/factory.py
  2. +4 −1 process/release.py
View
4 process/factory.py
@@ -2629,10 +2629,6 @@ 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,
View
5 process/release.py
@@ -785,7 +785,9 @@ def majorUpdateVerifyBuilders(platform):
else:
triggeredSchedulers = None
multiLocaleConfig = releaseConfig.get(
- 'mozharness_config', {}).get(platform)
+ 'mozharness_config', {}).get('platforms', {}).get(platform)
+ mozharnessMultiOptions = releaseConfig.get(
+ 'mozharness_config', {}).get('multilocaleOptions')
enableUpdatePackaging = bool(releaseConfig.get('verifyConfigs',
{}).get(platform))
build_factory = ReleaseBuildFactory(
@@ -832,6 +834,7 @@ def majorUpdateVerifyBuilders(platform):
mozharnessTag=branchConfig['mozharness_tag'],
multiLocaleScript=pf.get('multi_locale_script'),
multiLocaleConfig=multiLocaleConfig,
+ mozharnessMultiOptions=mozharnessMultiOptions,
usePrettyNames=releaseConfig.get('usePrettyNames', True),
enableUpdatePackaging=enableUpdatePackaging,
mozconfigBranch=releaseTag,
Please sign in to comment.
Something went wrong with that request. Please try again.