Skip to content
This repository has been archived by the owner on Aug 14, 2020. It is now read-only.

Commit

Permalink
bug 943860 - In builds.py.build_metadata, check the SourceRepository …
Browse files Browse the repository at this point in the history
…to see if it contains any of the strings 'mozilla-central', 'mozilla-inbound', 'mozilla-aurora', 'mozilla-beta'. This allows the use of local repositories to create builds, r=mcote.
  • Loading branch information
bclary committed Dec 2, 2013
1 parent 8be23b3 commit cfc1931
Showing 1 changed file with 14 additions and 13 deletions.
27 changes: 14 additions & 13 deletions builds.py
Expand Up @@ -409,19 +409,20 @@ def build_metadata(self, build_dir):
buildid = cfg.get('App', 'BuildID')
blddate = datetime.datetime.strptime(buildid,
'%Y%m%d%H%M%S')
procname = ''
if repo == 'http://hg.mozilla.org/mozilla-central':
tree = 'mozilla-central'
procname = 'org.mozilla.fennec'
elif repo == 'http://hg.mozilla.org/integration/mozilla-inbound':
tree = 'mozilla-inbound'
procname = 'org.mozilla.fennec'
elif repo == 'http://hg.mozilla.org/releases/mozilla-aurora':
tree = 'mozilla-aurora'
procname = 'org.mozilla.fennec_aurora'
elif repo == 'http://hg.mozilla.org/releases/mozilla-beta':
tree = 'mozilla-beta'
procname = 'org.mozilla.firefox'
tree = None
procname = None
for temp_tree, temp_procname in (
('mozilla-central', 'org.mozilla.fennec'),
('mozilla-inbound', 'org.mozilla.fennec'),
('mozilla-aurora', 'org.mozilla.fennec_aurora'),
('mozilla-beta', 'org.mozilla.firefox')):
if temp_tree in repo:
tree = temp_tree
procname = temp_procname
break
if not tree:
raise BuildCacheException('build %s contains an unknown SourceRepository %s' %
(apkfile, repo))

metadata = {'cache_build_dir': build_dir,
'tree': tree,
Expand Down

0 comments on commit cfc1931

Please sign in to comment.