Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge from default

changeset:   2268:b03cb9f27207
parent:      2265:28ed61ce33a4
user:        John Ford <jhford@mozilla.com>
date:        Wed Apr 25 22:38:54 2012 -0700
summary:     bug 749076 - tooltool should run in overwrite mode r=nthomas

changeset:   2269:8d27257a6713
user:        Ben Hearsum <bhearsum@mozilla.com>
date:        Thu Apr 26 09:23:29 2012 -0400
summary:     bug 743977: turn off balrog client for staging and preproduction builds. r=rail

changeset:   2270:1e1e89dd6b0d
user:        Armen Zambrano Gasparnian <armenzg@mozilla.com>
date:        Thu Apr 26 09:27:44 2012 -0400
summary:     Bug 729392. Add MOZ_NODE_PATH to Linux testers. r=coop

changeset:   2271:0f6003269247
tag:         tip
user:        Rail Aliiev <rail@mozilla.com>
date:        Thu Apr 26 13:56:53 2012 -0400
summary:     Backed out changeset 1e1e89dd6b0d (node.exe not deployed yet)

--HG--
branch : production-0.8
  • Loading branch information...
commit 7a95d1cbaac22e9fa7a29f51c82de3a220cf3dd9 2 parents d239245 + 8c54226
@rail rail authored
Showing with 3 additions and 3 deletions.
  1. +2 −2 misc.py
  2. +1 −1  process/factory.py
View
4 misc.py
@@ -1303,7 +1303,7 @@ def generateBranchObjects(config, name, secrets=None):
ausSshKey=config['aus2_ssh_key'],
ausHost=config['aus2_host'],
hashType=config['hash_type'],
- balrog_api_root=config['balrog_api_root'],
+ balrog_api_root=config.get('balrog_api_root', None),
balrog_credentials_file=config['balrog_credentials_file'],
buildSpace=buildSpace,
clobberURL=config['base_clobber_url'],
@@ -1390,7 +1390,7 @@ def generateBranchObjects(config, name, secrets=None):
ausUser=config['aus2_user'],
ausSshKey=config['aus2_ssh_key'],
ausHost=config['aus2_host'],
- balrog_api_root=config['balrog_api_root'],
+ balrog_api_root=config.get('balrog_api_root', None),
balrog_credentials_file=config['balrog_credentials_file'],
hashType=config['hash_type'],
stageServer=config['stage_server'],
View
2  process/factory.py
@@ -1204,7 +1204,7 @@ def addConfigSteps(self):
self.addStep(RetryingShellCommand(
name='fetch_tooltool_resources',
command=['python', self.tooltool_script, '--url', self.tooltool_url_list[0],
- '-m', self.tooltool_manifest_src, 'fetch']))
+ '--overwrite', '-m', self.tooltool_manifest_src, 'fetch']))
self.addStep(ShellCommand(
name='tooltool_bootstrap',
command=['bash', self.tooltool_bootstrap]))
Please sign in to comment.
Something went wrong with that request. Please try again.