diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-02-10 13:59:04 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-02-11 16:04:44 +0000 |
| commit | d17c912ec302ebe6075b0dc1da95dceb7f84a435 (patch) | |
| tree | 2aa56c4b9454a873488f8d16903809a5b94554f1 | |
| parent | b1357de71824f647ab34d821da319258cc19b83a (diff) | |
| download | morph-d17c912ec302ebe6075b0dc1da95dceb7f84a435.tar.gz | |
distbuild: Use source.files() to work out what artifacts to transfer
| -rw-r--r-- | distbuild/worker_build_scheduler.py | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/distbuild/worker_build_scheduler.py b/distbuild/worker_build_scheduler.py index be732153..be63c642 100644 --- a/distbuild/worker_build_scheduler.py +++ b/distbuild/worker_build_scheduler.py @@ -544,25 +544,15 @@ class WorkerConnection(distbuild.StateMachine): logging.debug('Requesting shared artifact cache to get artifacts') - kind = self._job.artifact.source.morphology['kind'] - - if kind == 'chunk': - source_artifacts = self._job.artifact.source.artifacts - - suffixes = ['%s.%s' % (kind, name) for name in source_artifacts] - suffixes.append('build-log') - else: - filename = '%s.%s' % (kind, self._job.artifact.name) - suffixes = [filename] - - if kind == 'stratum': - suffixes.append(filename + '.meta') - - suffixes = [urllib.quote(x) for x in suffixes] + files = self._job.artifact.source.files() + suffixes = [] + for basename in files: + suffix = basename.lstrip(self._job.artifact.source.cache_key + '.') + suffixes.append(urllib.quote(suffix)) suffixes = ','.join(suffixes) worker_host = self._conn.getpeername()[0] - + url = urlparse.urljoin( self._writeable_cache_server, '/1.0/fetch?host=%s:%d&cacheid=%s&artifacts=%s' % |