[oe-commits] org.oe.dev mono.bbclass: fix whitespace problem

[henryk commit]

mono.bbclass: fix whitespace problem
- fix for the problem experienced by scruggs on IRC today. There
was an inconsistency in the amount and type of whitespace used in the
python anonymous blocks between mono.bbclass and multimachine.bbclass.

- fixed a small problem in the error output of mono_do_clilibs

Author: henryk at openmoko.org
Branch: org.openembedded.dev
Revision: 9b11d89eb867c4452963750a9d48fa45c70d0de6
ViewMTN: http://monotone.openembedded.org/revision/info/9b11d89eb867c4452963750a9d48fa45c70d0de6
Files:
1
classes/mono.bbclass
Diffs:

#
# mt diff -r7604e2e8a0c76d28ec378a7800c3e1a42b335da5 -r9b11d89eb867c4452963750a9d48fa45c70d0de6
#
# 
# 
# patch "classes/mono.bbclass"
#  from [8c6f975d1387bb98881133402216adc4c3dcaac8]
#    to [0877f77ba914921ba869e976db741cb7a21eabff]
# 
============================================================
--- classes/mono.bbclass	8c6f975d1387bb98881133402216adc4c3dcaac8
+++ classes/mono.bbclass	0877f77ba914921ba869e976db741cb7a21eabff
@@ -186,7 +186,7 @@ python mono_do_clilibs() {
 				if not dep_pkg in deps:
 					deps.append(dep_pkg)
 			else:
-				bb.note("Couldn't find CLI library provider for %s" % n)
+				bb.note("Couldn't find CLI library provider for %s" % (n,))
 
 		deps_file = os.path.join(pkgdest, pkg + ".clilibdeps")
 		if os.path.exists(deps_file):
@@ -198,7 +198,8 @@ python mono_do_clilibs() {
 			fd.close()
 }
 
-python() {
+def mono_after_parse(d):
+	import bb
 	# Insert mono_do_clilibs into PACKAGEFUNCS
 	# Needs to be called after populate_packages, but before read_shlibdeps
 	PACKAGEFUNCS = bb.data.getVar("PACKAGEFUNCS", d, 1)
@@ -211,4 +212,7 @@ python() {
 			i = PACKAGEFUNCS.index("populate_packages")
 			PACKAGEFUNCS.insert(i+1, "mono_do_clilibs")
 		bb.data.setVar("PACKAGEFUNCS", " ".join(PACKAGEFUNCS), d)
+
+python () {
+    mono_after_parse(d)
 }