diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-03-12 17:33:27 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-03-12 17:33:27 +0000 |
| commit | ca74e62cd114045270a0bc5fc63acb0f5ae4a968 (patch) | |
| tree | 1821f9a20665523ee5f33316498fd11999ad37c8 | |
| parent | 4abbd9f8c01301f62ed8817d2e31fadcde1bffda (diff) | |
| parent | ff473bab72a3a42ceee228b739577a153a3840de (diff) | |
| download | morph-ca74e62cd114045270a0bc5fc63acb0f5ae4a968.tar.gz | |
Merge branch 'sam/build-cluster-error'
Reviewed-By: Richard Maw <richard.maw@codethink.co.uk>
| -rw-r--r-- | morphlib/app.py | 5 | ||||
| -rw-r--r-- | morphlib/artifactsplitrule.py | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/morphlib/app.py b/morphlib/app.py index 9ceca9a8..409e0a12 100644 --- a/morphlib/app.py +++ b/morphlib/app.py @@ -359,7 +359,10 @@ class Morph(cliapp.Application): morphology = resolved_morphologies[reference] visit(reponame, ref, filename, absref, tree, morphology) - if morphology['kind'] == 'system': + if morphology['kind'] == 'cluster': + raise cliapp.AppException( + "Cannot build a morphology of type 'cluster'.") + elif morphology['kind'] == 'system': queue.extend((s.get('repo') or reponame, s.get('ref') or ref, '%s.morph' % s['morph']) diff --git a/morphlib/artifactsplitrule.py b/morphlib/artifactsplitrule.py index 246691d8..bc92e5fb 100644 --- a/morphlib/artifactsplitrule.py +++ b/morphlib/artifactsplitrule.py @@ -300,4 +300,4 @@ def unify_system_matches(morphology): def unify_cluster_matches(_): - return None + return SplitRules() |