summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-17 11:16:18 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-17 12:26:12 +0100
commit1e190eef71376fb0ad89c1a661009d9fb46a7d58 (patch)
tree0c440c358e48836bf12a9aea17c44092aa34c824
parent8cc3b24242624b3ec750db3a09262fe14efb0193 (diff)
downloadpoky-1e190eef71376fb0ad89c1a661009d9fb46a7d58.tar.gz
poky-1e190eef71376fb0ad89c1a661009d9fb46a7d58.tar.bz2
poky-1e190eef71376fb0ad89c1a661009d9fb46a7d58.zip
sanity.bbclass: If the sanity tests fail, don't mark them as complete
If the sanity tests fail, we still were writing out the stamp which means they'd get skipped the next time we run bitbake. This is clearly wrong and we should only write out the stamp file if the sanity tests complete successfully. (From OE-Core rev: b99acaa8aa06dcbca46c3f7048124d6f8d643a8b) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/sanity.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 1b941ac58c..4d4abd3ea5 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -378,7 +378,7 @@ def check_sanity(e):
if last_sstate_dir != sstate_dir:
messages = messages + check_sanity_sstate_dir_change(sstate_dir, e.data)
- if os.path.exists("conf"):
+ if os.path.exists("conf") and not messages:
f = file(sanityverfile, 'w')
f.write("SANITY_VERSION %s\n" % sanity_version)
f.write("TMPDIR %s\n" % tmpdir)