summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Coldrick <adam.coldrick@codethink.co.uk>2014-06-24 10:12:11 +0000
committerAdam Coldrick <adam.coldrick@codethink.co.uk>2014-06-24 10:12:11 +0000
commit6f5294833f120612924a3f42d429c5d1965e9786 (patch)
tree2c8405593c0b7a3529d78d98d0747357d480d19f
parent6da0ef49f8d467a7820c9cf7fcbc13e566f5db47 (diff)
downloadmorph-6f5294833f120612924a3f42d429c5d1965e9786.tar.gz
Use definitions repo and ref if a path is specified
-rw-r--r--morphlib/app.py13
1 files changed, 8 insertions, 5 deletions
diff --git a/morphlib/app.py b/morphlib/app.py
index fd1536a9..e7385e7a 100644
--- a/morphlib/app.py
+++ b/morphlib/app.py
@@ -381,11 +381,14 @@ class Morph(cliapp.Application):
s.get('ref') or ref,
morphlib.util.sanitise_morphology_path(s['morph']))
for s in morphology['build-depends'])
- queue.extend(
- (c['repo'],
- c['ref'],
- morphlib.util.sanitise_morphology_path(c['morph']))
- for c in morphology['chunks'])
+ for c in morphology['chunks']:
+ if 'morph' not in c:
+ reponame = c['repo']
+ ref = c['ref']
+ queue.append(
+ (reponame,
+ ref,
+ morphlib.util.sanitise_morphology_path(c['morph'])))
def cache_repo_and_submodules(self, cache, url, ref, done):
subs_to_process = set()