Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-25 11:15:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1217431 - Don't get 'latest' URLs for android updates; r=jlund

Browse Source
This commit is contained in:
Mike Shal 2015-10-23 13:15:34 -04:00
parent 9507291e59
commit 926ed575ad
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
testing/mozharness/mozharness/mozilla/building/buildbase.py
View File

@ -135,10 +135,15 @@ class MakeUploadOutputParser(OutputParser):
# For android builds, the package is also used as the mar file.
# Grab the first one, since that is the one in the
# nightly/YYYY/MM directory
if self.use_package_as_marfile and 'completeMarUrl' not in self.matches:
self.info("Using package as mar file: %s" % m)
self.matches['completeMarUrl'] = m
u, self.package_filename = os.path.split(m)
if self.use_package_as_marfile:
if 'tinderbox-builds' in m or 'nightly/latest-' in m:
self.info("Skipping wrong packageUrl: %s" % m)
else:
if 'completeMarUrl' in self.matches:
self.fatal("Found multiple package URLs. Please update buildbase.py")
self.info("Using package as mar file: %s" % m)
self.matches['completeMarUrl'] = m
u, self.package_filename = os.path.split(m)
if self.use_package_as_marfile and self.package_filename:
# The checksum file is also dumped during 'make upload'. Look