summaryrefslogtreecommitdiff
path: root/morph
diff options
context:
space:
mode:
authorJannis Pohlmann <jannis.pohlmann@codethink.co.uk>2012-04-18 16:49:24 +0100
committerJannis Pohlmann <jannis.pohlmann@codethink.co.uk>2012-04-18 16:49:24 +0100
commit105c0dbbd14626a832ebc036c02bc0c9c60e43bc (patch)
tree9e9398e9e4d4bc8da54a63094142f941b881419e /morph
parent605e21914f8c9536ff42ca31043b26200dab85e2 (diff)
downloadmorph-105c0dbbd14626a832ebc036c02bc0c9c60e43bc.tar.gz
Remove BuildGraph, compute cache keys based on Artifacts.
With this commit, the ArtifactResolver no longer computes the cache keys when creating Artifact objects. This will have to happen as a post-resolving step (e.g. prior to building or checking whether a local or remote artifact cache has any of the resolved artifacts). The CacheKeyComputer now takes an Artifact object and computes the cache keys using its dependencies. BuildGraph is no longer needed for the CacheKeyComputer unit tests.
Diffstat (limited to 'morph')
-rwxr-xr-xmorph4
1 files changed, 1 insertions, 3 deletions
diff --git a/morph b/morph
index 1d6dc4cb..0b1e57eb 100755
--- a/morph
+++ b/morph
@@ -259,9 +259,7 @@ class Morph(cliapp.Application):
local_repo_cache, remote_repo_cache,
repo, ref, filename)
- env = morphlib.buildenvironment.BuildEnvironment(self.settings)
- computer = morphlib.cachekeycomputer.CacheKeyComputer(env)
- resolver = morphlib.artifactresolver.ArtifactResolver(computer)
+ resolver = morphlib.artifactresolver.ArtifactResolver()
artifacts = resolver.resolve_artifacts(pool)
self.output.write('dependency graph for %s|%s|%s:\n' %