Bug 1156278: Make query_branch() more robust.
If a trailing slash exists in the repo name, query_branch fails returning
an empty string. We fix that by stripping trailing slashes.
--- a/scripts/b2g_build.py
+++ b/scripts/b2g_build.py
@@ -186,17 +186,17 @@ class B2GBuild(LocalesMixin, PurgeMixin,
abs_dirs.update(dirs)
self.abs_dirs = abs_dirs
return self.abs_dirs
def query_branch(self):
if self.buildbot_config and 'properties' in self.buildbot_config:
return self.buildbot_config['properties']['branch']
else:
- return os.path.basename(self.query_repo())
+ return os.path.basename(self.query_repo().rstrip('/'))
def query_buildid(self):
if self.buildid:
return self.buildid
platform_ini = os.path.join(self.query_device_outputdir(),
'system', 'b2g', 'platform.ini')
data = self.read_from_file(platform_ini)
buildid = re.search("^BuildID=(\d+)$", data, re.M)