From bc9fa9d1d34e5e7451cd57fa4e06ea91a7879e01 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Wed, 26 Dec 2007 20:15:30 +0000 Subject: classes/insane.bbclass: Make .la failures non-fatal the right way, split up the .la test in two parts -We have a function that can decide if a failure is fatal, use that instead of setting sane = True. -Test for installed and workdir separately. This allows us to ignore a certain error class and complain on others. --- classes/insane.bbclass | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/classes/insane.bbclass b/classes/insane.bbclass index 2b0be932d9..1a6ea21b5e 100644 --- a/classes/insane.bbclass +++ b/classes/insane.bbclass @@ -178,7 +178,7 @@ def package_qa_make_fatal_error(error_class, name, path,d): TODO: Load a whitelist of known errors """ - if error_class == 0: + if error_class == 0 or error_class == 5: return False else: return True @@ -339,14 +339,21 @@ def package_qa_check_staged(path,d): path = os.path.join(root,file) if file[-2:] == "la": file_content = open(path).read() - if installed in file_content or workdir in file_content: - bb.error("QA issue: %s failed sanity test (reference to workdir or installed)" % file ) + if installed in file_content: + bb.error("QA issue: %s failed sanity test (installed) in path %s" % \ + (file,root)) if package_qa_make_fatal_error( 5, "staging", path, d): - sane = True + sane = False + if workdir in file_content: + bb.error("QA issue: %s failed sanity test (workdir) in path %s" % \ + (file,root)) + if package_qa_make_fatal_error( 5, "staging", path, d): + sane = False elif file[-2:] == "pc": file_content = open(path).read() if workdir in file_content: - bb.error("QA issue: %s failed sanity test (reference to workdir)" % file ) + bb.error("QA issue: %s failed sanity test (workdir) in path %s" % \ + (file,root)) if package_qa_make_fatal_error( 6, "staging", path, d): sane = False -- cgit v1.2.3