Bug 820245, followup tweaks for manifests, r=catlee

mozilla · Dec 13, 2012 · 1a415c1 · 1a415c1
1 parent 966d278
commit 1a415c1
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/scripts/b2g_build.py b/scripts/b2g_build.py
@@ -237,14 +237,15 @@ 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:
                 r = urllib2.urlopen(url, timeout=10)
                 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