diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2013-03-13 15:33:11 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2013-03-14 17:39:11 +0000 |
| commit | 7339b195554ad0d439017bdcce2426e824e66210 (patch) | |
| tree | 41ed1571b4e783fc5eba679f2226025794e6f7ec | |
| parent | d2eb452ee48253d6e90f7aa4f6c41b6fd8cdf009 (diff) | |
| download | morph-7339b195554ad0d439017bdcce2426e824e66210.tar.gz | |
Only build systems again
We can no longer build strata individually because we don't know
what architecture they are for.
| -rw-r--r-- | morphlib/buildcommand.py | 2 | ||||
| -rw-r--r-- | tests.build/no-isolated-chunk-builds.stderr | 1 | ||||
| -rwxr-xr-x | tests.build/only-build-systems.script (renamed from tests.build/no-isolated-chunk-builds.script) | 2 | ||||
| -rw-r--r-- | tests.build/only-build-systems.stderr | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/morphlib/buildcommand.py b/morphlib/buildcommand.py index 6fe46e0b..55bb0158 100644 --- a/morphlib/buildcommand.py +++ b/morphlib/buildcommand.py @@ -85,7 +85,7 @@ class BuildCommand(object): self.lrc, self.rrc, (repo_name, ref, filename)) root_kind = srcpool.lookup(repo_name, ref, filename).morphology['kind'] - if root_kind not in ['system', 'stratum']: + if root_kind is not 'system': raise morphlib.Error( 'Building a %s directly is not supported' % root_kind) diff --git a/tests.build/no-isolated-chunk-builds.stderr b/tests.build/no-isolated-chunk-builds.stderr deleted file mode 100644 index 502ce9a6..00000000 --- a/tests.build/no-isolated-chunk-builds.stderr +++ /dev/null @@ -1 +0,0 @@ -ERROR: Building a chunk directly is not supported diff --git a/tests.build/no-isolated-chunk-builds.script b/tests.build/only-build-systems.script index 07e33479..699be942 100755 --- a/tests.build/no-isolated-chunk-builds.script +++ b/tests.build/only-build-systems.script @@ -21,7 +21,7 @@ set -eu -"$SRCDIR/scripts/test-morph" build-morphology \ +! "$SRCDIR/scripts/test-morph" build-morphology \ test:morphs-repo master hello-stratum ! "$SRCDIR/scripts/test-morph" build-morphology \ diff --git a/tests.build/only-build-systems.stderr b/tests.build/only-build-systems.stderr new file mode 100644 index 00000000..ba7339d2 --- /dev/null +++ b/tests.build/only-build-systems.stderr @@ -0,0 +1,2 @@ +ERROR: Building a stratum directly is not supported +ERROR: Building a chunk directly is not supported |