From 85c8dd4170a88a5d7f3d9ca181e75720302727c5 Mon Sep 17 00:00:00 2001 From: Stefan Stanacar Date: Sun, 9 Feb 2014 12:39:31 +0200 Subject: testimage: fail if no package manifest is found Sometimes we may forget to actually build the image we want to test (when testimage task is called manually). Instead of an ugly traceback we should fail nicely. The manifest is written after the rootfs so this ensures the image was actually built. Signed-off-by: Stefan Stanacar Signed-off-by: Richard Purdie --- meta/classes/testimage.bbclass | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass index 75ab716270..48e1032326 100644 --- a/meta/classes/testimage.bbclass +++ b/meta/classes/testimage.bbclass @@ -185,8 +185,11 @@ def testimage_main(d): self.imagefeatures = d.getVar("IMAGE_FEATURES", True).split() self.distrofeatures = d.getVar("DISTRO_FEATURES", True).split() manifest = os.path.join(d.getVar("DEPLOY_DIR_IMAGE", True), d.getVar("IMAGE_LINK_NAME", True) + ".manifest") - with open(manifest) as f: - self.pkgmanifest = f.read() + try: + with open(manifest) as f: + self.pkgmanifest = f.read() + except IOError as e: + bb.fatal("No package manifest file found. Did you build the image?\n%s" % e) # test context tc = TestContext() -- cgit 1.2.3-korg