[oe-commits] [openembedded-core] 35/39: classes/license: drop erroneous sha256 parameter in LIC_FILES_CHKSUM

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch pyro-next
in repository openembedded-core.

commit 7f74ff71ae9d9ef1ca55c12be16094f1a9d7fade
Author: Paul Eggleton <paul.eggleton at linux.intel.com>
AuthorDate: Thu Aug 31 11:46:22 2017 +1200

    classes/license: drop erroneous sha256 parameter in LIC_FILES_CHKSUM
    
    In OE-Core commit a48fea275b08ff3d3dfc9a928aeb04768db35873, a check on
    the value of a "sha256" parameter was added, however there was no
    mention of this in the commit message and no corresponding code to
    actually verify the checksum as sha256 was added along with it either,
    so there's no point in getting the value. Additionally it was assuming
    that a sha256 value would be present without checking first, with the
    result that if you leave out the md5 value in a recipe intentionally in
    order to get it to tell you the correct value on the next build, you got
    a traceback instead of the appropriate error containing the information.
    Drop this entirely - if we want to implement this we need to do it
    properly.
    
    (From OE-Core rev: e9eaa7d15fe7ab643ab19556dab84051f8f1974e)
    
    Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
    Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 meta/classes/license.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index d4be478..b1fffe7 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -491,7 +491,7 @@ def find_license_files(d):
         except bb.fetch.MalformedUrl:
             bb.fatal("%s: LIC_FILES_CHKSUM contains an invalid URL:  %s" % (d.getVar('PF'), url))
         # We want the license filename and path
-        chksum = parm['md5'] if 'md5' in parm else parm['sha256']
+        chksum = parm.get('md5', None)
         beginline = parm.get('beginline')
         endline = parm.get('endline')
         lic_chksums[path] = (chksum, beginline, endline)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.