Permalink
Browse files

backing out 90dfbcb12d53 for scripts/b2g_build.py only.

  • Loading branch information...
1 parent 3c85684 commit c91bd2943ed80536015663143e16e27cacf83261 @escapewindow escapewindow committed Nov 12, 2012
Showing with 6 additions and 14 deletions.
  1. +6 −14 scripts/b2g_build.py
View
@@ -194,13 +194,8 @@ def checkout_gecko(self):
# build/gecko' works
self.mkdir_p(os.path.dirname(dirs['src']))
- repos = [{
- 'repo': self.query_repo(),
- 'revision': self.query_revision(),
- 'dest': os.path.basename(dirs['src']),
- }]
- num_retries = self.config.get("global_retries", 10)
- rev = self.vcs_checkout_repos(repos, num_retries=num_retries)
+ repo = self.query_repo()
+ rev = self.vcs_checkout(repo=repo, dest=dirs['src'], revision=self.query_revision())
self.set_buildbot_property('revision', rev, write_to_file=True)
def download_gonk(self):
@@ -260,13 +255,10 @@ def checkout_gaia(self):
gecko_config = self.load_gecko_config()
if 'gaia' in gecko_config:
- repos = [{
- 'repo': gecko_config['gaia']['repo'],
- 'vcs': gecko_config['gaia']['vcs'],
- 'dest': os.path.join(dirs['abs_work_dir'], 'gaia'),
- }]
- num_retries = self.config.get("global_retries", 10)
- rev = self.vcs_checkout_repos(repos, num_retries=num_retries)
+ dest = os.path.join(dirs['abs_work_dir'], 'gaia')
+ repo = gecko_config['gaia']['repo']
+ vcs = gecko_config['gaia']['vcs']
+ rev = self.vcs_checkout(repo=repo, dest=dest, vcs=vcs)
self.set_buildbot_property('gaia_revision', rev, write_to_file=True)
def build(self):

0 comments on commit c91bd29

Please sign in to comment.