diff options
-rw-r--r-- | meta/classes/insane.bbclass | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index e77e993325..55ed91f8dc 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass | |||
@@ -604,9 +604,6 @@ def package_qa_check_license(workdir, d): | |||
604 | raise bb.build.FuncFailed( pn + ": LIC_FILES_CHKSUM points to an invalid file: " + srclicfile) | 604 | raise bb.build.FuncFailed( pn + ": LIC_FILES_CHKSUM points to an invalid file: " + srclicfile) |
605 | 605 | ||
606 | recipemd5 = parm.get('md5', '') | 606 | recipemd5 = parm.get('md5', '') |
607 | if not recipemd5: | ||
608 | bb.error(pn + ": md5 checksum is not specified for ", url) | ||
609 | return False | ||
610 | beginline, endline = 0, 0 | 607 | beginline, endline = 0, 0 |
611 | if 'beginline' in parm: | 608 | if 'beginline' in parm: |
612 | beginline = int(parm['beginline']) | 609 | beginline = int(parm['beginline']) |
@@ -638,18 +635,22 @@ def package_qa_check_license(workdir, d): | |||
638 | if recipemd5 == md5chksum: | 635 | if recipemd5 == md5chksum: |
639 | bb.note (pn + ": md5 checksum matched for ", url) | 636 | bb.note (pn + ": md5 checksum matched for ", url) |
640 | else: | 637 | else: |
641 | bb.error (pn + ": md5 data is not matching for ", url) | 638 | if recipemd5: |
642 | bb.error (pn + ": The new md5 checksum is ", md5chksum) | 639 | bb.error(pn + ": md5 data is not matching for ", url) |
643 | if beginline: | 640 | bb.error(pn + ": The new md5 checksum is ", md5chksum) |
644 | if endline: | 641 | if beginline: |
645 | srcfiledesc = "%s (lines %d through to %d)" % (srclicfile, beginline, endline) | 642 | if endline: |
643 | srcfiledesc = "%s (lines %d through to %d)" % (srclicfile, beginline, endline) | ||
644 | else: | ||
645 | srcfiledesc = "%s (beginning on line %d)" % (srclicfile, beginline) | ||
646 | elif endline: | ||
647 | srcfiledesc = "%s (ending on line %d)" % (srclicfile, endline) | ||
646 | else: | 648 | else: |
647 | srcfiledesc = "%s (beginning on line %d)" % (srclicfile, beginline) | 649 | srcfiledesc = srclicfile |
648 | elif endline: | 650 | bb.error(pn + ": Check if the license information has changed in %s to verify that the LICENSE value \"%s\" remains valid" % (srcfiledesc, lic)) |
649 | srcfiledesc = "%s (ending on line %d)" % (srclicfile, endline) | ||
650 | else: | 651 | else: |
651 | srcfiledesc = srclicfile | 652 | bb.error(pn + ": md5 checksum is not specified for ", url) |
652 | bb.error(pn + ": Check if the license information has changed in %s to verify that the LICENSE value \"%s\" remains valid" % (srcfiledesc, lic)) | 653 | bb.error(pn + ": The md5 checksum is ", md5chksum) |
653 | sane = False | 654 | sane = False |
654 | 655 | ||
655 | return sane | 656 | return sane |