[oe-commits] Ross Burton : base.bbclass: use bb.utils.*_sum instead of calling md5/ sha sum commands

[git version control]

Module: openembedded.git
Branch: holger/staging-branch
Commit: 48eb9e80aa5a6134ab49dafd415345d1745f4a51
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=48eb9e80aa5a6134ab49dafd415345d1745f4a51

Author: Ross Burton <ross at openedhand.com>
Date:   Fri Jan 15 08:30:33 2010 +0000

base.bbclass: use bb.utils.*_sum instead of calling md5/sha sum commands

Patch courtesy the Poky project.

Signed-off-by: Chris Larson <clarson at mvista.com>

---

 classes/base.bbclass |   27 +++++++++++++++------------
 1 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/classes/base.bbclass b/classes/base.bbclass
index 7ea15f0..2172aac 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -76,23 +76,26 @@ def base_chk_file_vars(parser, localpath, params, data):
         raise Exception("The path does not exist '%s'" % localpath)
 
     if want_md5sum:
-        try:
-	    md5pipe = os.popen('PATH=%s md5sum %s' % (bb.data.getVar('PATH', data, True), localpath))
-            md5data = (md5pipe.readline().split() or [ "" ])[0]
-            md5pipe.close()
-        except OSError, e:
-            raise Exception("Executing md5sum failed")
+        md5data = bb.utils.md5_file(localpath)
+
         if want_md5sum != md5data:
             bb.note("The MD5Sums did not match. Wanted: '%s' and Got: '%s'" % (want_md5sum, md5data))
             raise Exception("MD5 Sums do not match. Wanted: '%s' Got: '%s'" % (want_md5sum, md5data))
 
     if want_sha256sum:
-        try:
-            shapipe = os.popen('PATH=%s oe_sha256sum %s' % (bb.data.getVar('PATH', data, True), localpath))
-            sha256data = (shapipe.readline().split() or [ "" ])[0]
-            shapipe.close()
-        except OSError, e:
-            raise Exception("Executing shasum failed")
+        shadata = bb.utils.sha256_file(localpath)
+
+        # sha256_file() can return None if we are running on Python 2.4 (hashlib is
+        # 2.5 onwards, sha in 2.4 is 160-bit only), so check for this and call the
+        # standalone shasum binary if required.
+        if shadata is None:
+            try:
+                shapipe = os.popen('PATH=%s oe_sha256sum %s' % (bb.data.getVar('PATH', data, True), localpath))
+                shadata = (shapipe.readline().split() or [ "" ])[0]
+                shapipe.close()
+            except OSError:
+                raise Exception("Executing shasum failed, please build shasum-native")
+
         if want_sha256sum != sha256data:
             bb.note("The SHA256Sums did not match. Wanted: '%s' and Got: '%s'" % (want_sha256sum, sha256data))
             raise Exception("SHA256 Sums do not match. Wanted: '%s' Got: '%s'" % (want_sha256sum, sha256data))