base.bbclass: Remove showdata task (its broken and bitbake -e is equivalent and not broken), tweak URI checksum messages

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2627 311d38ba-8fff-0310-9ca6-ca027cbcb966

1 files changed, 5 insertions, 14 deletions

diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 3551e35a1..6f49ab046 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -374,18 +374,6 @@ oe_machinstall() {
 	fi
 }
 
-addtask showdata
-do_showdata[nostamp] = "1"
-python do_showdata() {
-	import sys
-	# emit variables and shell functions
-	bb.data.emit_env(sys.__stdout__, d, True)
-	# emit the metadata which isnt valid shell
-	for e in d.keys():
-	    if bb.data.getVarFlag(e, 'python', d):
-	        sys.__stdout__.write("\npython %s () {\n%s}\n" % (e, bb.data.getVar(e, d, 1)))
-}
-
 addtask listtasks
 do_listtasks[nostamp] = "1"
 python do_listtasks() {
@@ -494,8 +482,11 @@ python base_do_fetch() {
 		(type,host,path,_,_,_) = bb.decodeurl(url)
 		uri = "%s://%s%s" % (type,host,path)
 		try:
-		    if not base_chk_file(parser, pn, pv,uri, localpath, d):
-			    bb.note("%s-%s-%s has no section, not checking URI" % (pn,pv,uri))
+			if not base_chk_file(parser, pn, pv,uri, localpath, d):
+				if type != "file":
+					bb.note("%s-%s-%s has no section, not checking URI" % (pn,pv,uri))
+				else:
+					bb.debug("%s-%s-%s has no section, not checking URI" % (pn,pv,uri))
 		except Exception:
 			raise bb.build.FuncFailed("Checksum of '%s' failed" % uri)
 }