summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/insane.bbclass12
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index bdfdc315aa..713b40eac4 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -600,7 +600,7 @@ python populate_lic_qa_checksum() {
600 return 600 return
601 601
602 if not lic_files and d.getVar('SRC_URI'): 602 if not lic_files and d.getVar('SRC_URI'):
603 sane = package_qa_handle_error("license-checksum", pn + ": Recipe file fetches files and does not have license file information (LIC_FILES_CHKSUM)", d) 603 sane &= package_qa_handle_error("license-checksum", pn + ": Recipe file fetches files and does not have license file information (LIC_FILES_CHKSUM)", d)
604 604
605 srcdir = d.getVar('S') 605 srcdir = d.getVar('S')
606 corebase_licensefile = d.getVar('COREBASE') + "/LICENSE" 606 corebase_licensefile = d.getVar('COREBASE') + "/LICENSE"
@@ -608,11 +608,11 @@ python populate_lic_qa_checksum() {
608 try: 608 try:
609 (type, host, path, user, pswd, parm) = bb.fetch.decodeurl(url) 609 (type, host, path, user, pswd, parm) = bb.fetch.decodeurl(url)
610 except bb.fetch.MalformedUrl: 610 except bb.fetch.MalformedUrl:
611 sane = package_qa_handle_error("license-checksum", pn + ": LIC_FILES_CHKSUM contains an invalid URL: " + url, d) 611 sane &= package_qa_handle_error("license-checksum", pn + ": LIC_FILES_CHKSUM contains an invalid URL: " + url, d)
612 continue 612 continue
613 srclicfile = os.path.join(srcdir, path) 613 srclicfile = os.path.join(srcdir, path)
614 if not os.path.isfile(srclicfile): 614 if not os.path.isfile(srclicfile):
615 sane = package_qa_handle_error("license-checksum", pn + ": LIC_FILES_CHKSUM points to an invalid file: " + srclicfile, d) 615 sane &= package_qa_handle_error("license-checksum", pn + ": LIC_FILES_CHKSUM points to an invalid file: " + srclicfile, d)
616 continue 616 continue
617 617
618 if (srclicfile == corebase_licensefile): 618 if (srclicfile == corebase_licensefile):
@@ -696,7 +696,7 @@ python populate_lic_qa_checksum() {
696 else: 696 else:
697 msg = pn + ": LIC_FILES_CHKSUM is not specified for " + url 697 msg = pn + ": LIC_FILES_CHKSUM is not specified for " + url
698 msg = msg + "\n" + pn + ": The md5 checksum is " + md5chksum 698 msg = msg + "\n" + pn + ": The md5 checksum is " + md5chksum
699 sane = package_qa_handle_error("license-checksum", msg, d) 699 sane &= package_qa_handle_error("license-checksum", msg, d)
700 700
701 if not sane: 701 if not sane:
702 bb.fatal("Fatal QA errors found, failing task.") 702 bb.fatal("Fatal QA errors found, failing task.")
@@ -733,14 +733,14 @@ def package_qa_check_staged(path,d):
733 file_content = file_content.replace(recipesysroot, "") 733 file_content = file_content.replace(recipesysroot, "")
734 if workdir in file_content: 734 if workdir in file_content:
735 error_msg = "%s failed sanity test (workdir) in path %s" % (file,root) 735 error_msg = "%s failed sanity test (workdir) in path %s" % (file,root)
736 sane = package_qa_handle_error("la", error_msg, d) 736 sane &= package_qa_handle_error("la", error_msg, d)
737 elif file.endswith(".pc"): 737 elif file.endswith(".pc"):
738 with open(path) as f: 738 with open(path) as f:
739 file_content = f.read() 739 file_content = f.read()
740 file_content = file_content.replace(recipesysroot, "") 740 file_content = file_content.replace(recipesysroot, "")
741 if pkgconfigcheck in file_content: 741 if pkgconfigcheck in file_content:
742 error_msg = "%s failed sanity test (tmpdir) in path %s" % (file,root) 742 error_msg = "%s failed sanity test (tmpdir) in path %s" % (file,root)
743 sane = package_qa_handle_error("pkgconfig", error_msg, d) 743 sane &= package_qa_handle_error("pkgconfig", error_msg, d)
744 744
745 return sane 745 return sane
746 746