From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Wed, 22 Jun 2011 15:08:29 +0000 (+0100)
Subject: base.bbclass: Since we require python 2.6 which always contains hashlib we can drop... 
X-Git-Tag: 2011-1~1007
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=4ac0b49b65106c2214ae80517fe9f66630d4540c;p=openembedded-core.git

base.bbclass: Since we require python 2.6 which always contains hashlib we can drop this fallback code

Signed-off-by: Richard  Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 4681489bb4..f390f0804f 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -326,16 +326,6 @@ python () {
         depends = depends + " osc-native:do_populate_sysroot"
         bb.data.setVarFlag('do_fetch', 'depends', depends, d)
 
-    # bb.utils.sha256_file() will fail if hashlib isn't present, so we fallback
-    # on shasum-native.  We need to ensure that it is staged before we fetch.
-    if bb.data.getVar('PN', d, True) != "shasum-native":
-        try:
-            import hashlib
-        except ImportError:
-            depends = bb.data.getVarFlag('do_fetch', 'depends', d) or ""
-            depends = depends + " shasum-native:do_populate_sysroot"
-            bb.data.setVarFlag('do_fetch', 'depends', depends, d)
-
     # *.xz should depends on xz-native for unpacking
     # Not endswith because of "*.patch.xz;patch=1". Need bb.decodeurl in future
     if '.xz' in srcuri: