Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Bug 820245, followup tweaks for manifests, r=catlee

  • Loading branch information...
commit 1a415c135fb8137124cfb09da49a25ecc0426c70 1 parent 966d278
@nthomas-mozilla nthomas-mozilla authored
Showing with 4 additions and 3 deletions.
  1. +4 −3 scripts/b2g_build.py
View
7 scripts/b2g_build.py
@@ -237,6 +237,7 @@ def query_revision(self):
def query_translated_revision(self, url, project, rev, attempts=5, sleeptime=15):
url = '%s/%s/git/%s' % (url, project, rev)
+ self.info('Mapping revision from hg to git using %s' % url)
n = 1
while n <= attempts:
try:
@@ -244,7 +245,7 @@ def query_translated_revision(self, url, project, rev, attempts=5, sleeptime=15)
j = json.loads(r.readline())
return j['git_rev']
except Exception, err:
- self.error('Error retrieving %s - %s' % (url, str(err)))
+ self.warning('Error: %s' % str(err))
if n == attempts:
self.fatal('Giving up')
return 'null'
@@ -397,7 +398,7 @@ def update_source_manifest(self):
gecko_config = self.load_gecko_config()
gaia_config = gecko_config.get('gaia')
manifest_config = self.config.get('manifest', {})
- branch = self.buildbot_config['properties'].get('branch')
+ branch = self.query_branch()
sourcesfile = os.path.join(dirs['work_dir'], 'sources.xml')
sourcesfile_orig = sourcesfile + '.original'
@@ -805,7 +806,7 @@ def upload_source_manifest(self):
self.info("Not a nightly build. Skipping...")
return
manifest_config = self.config.get('manifest')
- branch = self.buildbot_config['properties'].get('branch')
+ branch = self.query_branch()
if not manifest_config or not branch:
self.info("No manifest config or can't get branch from build. Skipping...")
return
Please sign in to comment.
Something went wrong with that request. Please try again.