summaryrefslogtreecommitdiff
path: root/morphlib/artifactresolver.py
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2012-09-03 12:52:54 +0100
committerJannis Pohlmann <jannis.pohlmann@codethink.co.uk>2012-09-04 11:00:28 +0000
commit606530b06b9ad41687da2e939ff3b8cf2fda0fa9 (patch)
treea17cb182187d3f27d7e6d41f55da912f55ea2a62 /morphlib/artifactresolver.py
parent8365f330721636c9913544c73eec356b57401e78 (diff)
downloadmorph-606530b06b9ad41687da2e939ff3b8cf2fda0fa9.tar.gz
ArtifactResolver: chunks cannot be duplicated in a stratum
We now enforce name uniqueness and don't yet implement a way of providing an alias for chunks, so self-dependency is impossible.
Diffstat (limited to 'morphlib/artifactresolver.py')
-rw-r--r--morphlib/artifactresolver.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/morphlib/artifactresolver.py b/morphlib/artifactresolver.py
index aed3c9c4..4b7956e0 100644
--- a/morphlib/artifactresolver.py
+++ b/morphlib/artifactresolver.py
@@ -195,6 +195,7 @@ class ArtifactResolver(object):
stratum.add_dependency(other_stratum)
queue.append(other_source)
+ # 'name' here is the chunk artifact name
chunk_artifacts = []
processed_artifacts = []
name_to_processed_artifact = {}
@@ -223,8 +224,6 @@ class ArtifactResolver(object):
if build_depends is None:
for earlier_artifact in processed_artifacts:
- if earlier_artifact is chunk_artifact:
- continue
if earlier_artifact.depends_on(chunk_artifact):
raise MutualDependencyError(
chunk_artifact, earlier_artifact)
@@ -232,8 +231,6 @@ class ArtifactResolver(object):
elif isinstance(build_depends, list):
for name in build_depends:
other_artifact = name_to_processed_artifact.get(name, None)
- if other_artifact is chunk_artifact:
- continue
if other_artifact:
chunk_artifact.add_dependency(other_artifact)
else: