diff options
author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-04-18 17:45:19 +0100 |
---|---|---|
committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-04-18 18:29:53 +0100 |
commit | be906f05d9da48b43f17c2e64e33ed68f944ff5c (patch) | |
tree | d826b61f7325b36269209d116ecb5a4b41b445fd /morph | |
parent | d996ddebee7b3d9c8a57b4b86e71c9ef31da3628 (diff) | |
download | morph-be906f05d9da48b43f17c2e64e33ed68f944ff5c.tar.gz |
Fixes to adapt to changes in master
Diffstat (limited to 'morph')
-rwxr-xr-x | morph | 13 |
1 files changed, 9 insertions, 4 deletions
@@ -263,12 +263,16 @@ class Morph(cliapp.Application): cachedir, self.settings['git-base-url'], bundle_base_url=self.settings['bundle-server']) + rrc = None for repo_name, ref, filename in self._itertriplets(args): logging.debug('cmd_build: %s %s %s' % (repo_name, ref, filename)) - srcpool = self._create_source_pool(lrc, repo_name, ref, filename) - ar = morphlib.artifactresolver.ArtifactResolver(ckc) + srcpool = self._create_source_pool(lrc, rrc, repo_name, ref, + filename) + ar = morphlib.artifactresolver.ArtifactResolver() artifacts = ar.resolve_artifacts(srcpool) + for artifact in artifacts: + artifact.cache_key = ckc.compute_key(artifact) order = morphlib.buildorder.BuildOrder(artifacts) needed = [] @@ -278,8 +282,9 @@ class Morph(cliapp.Application): needed.append(artifact) for artifact in needed: - repo = lrc.cache_repo(repo_name) - repo.update() + artifact.source.repo = lrc.cache_repo( + artifact.source.repo_name) + artifact.source.repo.update() if (self.settings['bootstrap'] or not self.settings['staging-chroot']): |