From 4e37fdf5adbf4d25561b472b4089b6782c599f93 Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Tue, 11 Sep 2012 18:05:56 +0100 Subject: Don't require .morph in triplet arguments This gives us consistency with morphologies, where the triplets are repo|ref|morphology, not repo|ref|filename Anyone who runs 'morph build baserock:morphs master system.morph' will now see an error ending with 'was looking for system.morph.morph', which should make it clear where they have gone wrong. --- tests.as-root/make-patch.script | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests.as-root/make-patch.script') diff --git a/tests.as-root/make-patch.script b/tests.as-root/make-patch.script index 1578a768..de1ce172 100755 --- a/tests.as-root/make-patch.script +++ b/tests.as-root/make-patch.script @@ -45,7 +45,7 @@ EOF # Build first image. Remember the stratum. "$SRCDIR/scripts/test-morph" build-morphology \ - test:morphs-repo master hello-system.morph + test:morphs-repo master hello-system img1=$(find "$DATADIR/cache/artifacts" -maxdepth 1 -name '*.system.*-rootfs') # Modify the chunk, in a new branch. @@ -65,7 +65,7 @@ sed -i 's/master/alfred/' "$DATADIR/morphs-repo/hello-system.morph" # Build second image. "$SRCDIR/scripts/test-morph" build-morphology \ - test:morphs-repo alfred hello-system.morph + test:morphs-repo alfred hello-system img2=$(find "$DATADIR/cache/artifacts" -maxdepth 1 -name '*.system.*' \ ! -name $(basename "$img1")) -- cgit v1.2.1