[oe-commits] org.oe.dev base.bbclass: fixed bug #2082 (Checksum doesn't expand "localpath" with "localdata") as proposed by bug reporter

[MartinDietze commit]

base.bbclass: fixed bug #2082 (Checksum doesn't expand "localpath" with "localdata") as proposed by bug reporter

Author: MartinDietze at openembedded.org
Branch: org.openembedded.dev
Revision: e322dd800546ea49944e3f03f8b891dca68aa4b2
ViewMTN: http://monotone.openembedded.org/revision.psp?id=e322dd800546ea49944e3f03f8b891dca68aa4b2
Files:
1
classes/base.bbclass
Diffs:

#
# mt diff -r1fd1fe4bce89990cfff9888401d78dca8ff3cb01 -re322dd800546ea49944e3f03f8b891dca68aa4b2
#
# 
# 
# patch "classes/base.bbclass"
#  from [740d1674cf5585aab21f3f578bb7ca7471f984be]
#    to [9004f91bbe289cad3eb97cedf148bbaf7735f04a]
# 
============================================================
--- classes/base.bbclass	740d1674cf5585aab21f3f578bb7ca7471f984be
+++ classes/base.bbclass	9004f91bbe289cad3eb97cedf148bbaf7735f04a
@@ -41,7 +41,7 @@ def base_chk_file(parser, pn, pv, src_ur
 
     # md5 and sha256 should be valid now
     if not os.path.exists(localpath):
-        bb.note("The locapath does not exist '%s'" % localpath)
+        bb.note("The localpath does not exist '%s'" % localpath)
         raise Exception("The path does not exist '%s'" % localpath)
 
 
@@ -483,7 +483,7 @@ python base_do_fetch() {
 
 	# Check each URI
 	for url in src_uri.split():
-		localpath = bb.fetch.localpath(url,localdata)
+		localpath = bb.data.expand(bb.fetch.localpath(url, localdata), localdata)
 		(type,host,path,_,_,_) = bb.decodeurl(url)
 		uri = "%s://%s%s" % (type,host,path)
 		try: