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

Bug 1191051 - Use full 40 character hashes in |mach artifact|. r=gps

Browse Source 
DONTBUILD NPOTB on a CLOSED TREE

--HG--
extra : commitid : 2ft26PqDgyT
extra : rebase_source : ca2eb4fe7c04e97fb78cd2175bd8549e13c13d7e
extra : amend_source : 10a2fa5931d151af448269239bdf2dc1980d3fae
This commit is contained in:
Nick Alexander 2015-08-04 13:32:00 -07:00
parent 26d416417a
commit 7593e20340
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
python/mozbuild/mozbuild/artifacts.py
View File

@ -206,9 +206,7 @@ class TaskCache(CacheManager):
'Unknown job {job}')
raise KeyError("Unknown job")
# Bug 1175655: it appears that the Task Cluster index only takes
# 12-char hex hashes.
key = '{rev}.{tree}.{job}'.format(rev=rev[:12], tree=tree, job=job)
key = '{rev}.{tree}.{job}'.format(rev=rev, tree=tree, job=job)
try:
namespace = 'buildbot.revisions.{key}'.format(key=key)
task = self._index.findTask(namespace)
@ -355,6 +353,9 @@ class Artifacts(object):
with self._task_cache as task_cache, self._pushhead_cache as pushhead_cache:
# with blocks handle handle persistence.
for pushhead in pushhead_cache.pushheads(self._tree, revset):
self.log(logging.DEBUG, 'artifact',
{'pushhead': pushhead},
'Trying to find artifacts for pushhead {pushhead}.')
try:
url = task_cache.artifact_url(self._tree, self._job, pushhead)
break
@ -362,6 +363,9 @@ class Artifacts(object):
pass
if url:
return self.install_from_url(url, distdir)
self.log(logging.ERROR, 'artifact',
{'revset': revset},
'No built artifacts for {revset} found.')
return 1
def install_from(self, source, distdir):