[oe-commits] org.oe.dev classes: Clean up anonymous function whitespace

[rpurdie commit]

classes: Clean up anonymous function whitespace

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 56b8494cc4de3df8119f44a770e679522b6fa241
ViewMTN: http://monotone.openembedded.org/revision.psp?id=56b8494cc4de3df8119f44a770e679522b6fa241
Files:
1
classes/base.bbclass
classes/ccache.inc
classes/ccdv.bbclass
classes/update-alternatives.bbclass
classes/update-rc.d.bbclass
Diffs:

#
# mt diff -rcced6203186e2a146f1ae687cf4da72d0cb2f914 -r56b8494cc4de3df8119f44a770e679522b6fa241
#
# 
# 
# patch "classes/base.bbclass"
#  from [fb4ec935de39df61ed43eaa0815eccf38d958af8]
#    to [2822ed1377b4f9aa808b33730d1e9c861f348f47]
# 
# patch "classes/ccache.inc"
#  from [2e03176c6c7991b8e8f92e4a2fe083a1bd690677]
#    to [f1d610852ac82af25b0ef1fa7a7d53e4f71e1881]
# 
# patch "classes/ccdv.bbclass"
#  from [0849548a0f861230765044eb99fff1f4c714ed3d]
#    to [0c353bbcc303df15f38c410ebe50655f0b4c8c39]
# 
# patch "classes/update-alternatives.bbclass"
#  from [bb1e120963bfcd8e1ce95ab8abf3d22f86450925]
#    to [fffc783f607f570749f319a888a3b4a1aad84d34]
# 
# patch "classes/update-rc.d.bbclass"
#  from [426fa6a0f46eb899a61e0f53f9f1f30b89668ba3]
#    to [8812f2d73cbeef9536c5598c2f3c1888e35b0aa3]
# 
============================================================
--- classes/base.bbclass	fb4ec935de39df61ed43eaa0815eccf38d958af8
+++ classes/base.bbclass	2822ed1377b4f9aa808b33730d1e9c861f348f47
@@ -688,17 +688,17 @@ def base_after_parse_two(d):
 
     need_machine = bb.data.getVar('COMPATIBLE_MACHINE', d, 1)
     if need_machine:
-	    import re
-	    this_machine = bb.data.getVar('MACHINE', d, 1)
-	    if this_machine and not re.match(need_machine, this_machine):
-		    raise bb.parse.SkipPackage("incompatible with machine %s" % this_machine)
+        import re
+        this_machine = bb.data.getVar('MACHINE', d, 1)
+        if this_machine and not re.match(need_machine, this_machine):
+            raise bb.parse.SkipPackage("incompatible with machine %s" % this_machine)
 
     pn = bb.data.getVar('PN', d, 1)
 
     # OBSOLETE in bitbake 1.7.4
     srcdate = bb.data.getVar('SRCDATE_%s' % pn, d, 1)
     if srcdate != None:
-	    bb.data.setVar('SRCDATE', srcdate, d)
+        bb.data.setVar('SRCDATE', srcdate, d)
 
     use_nls = bb.data.getVar('USE_NLS_%s' % pn, d, 1)
     if use_nls != None:
@@ -715,7 +715,7 @@ def base_after_parse(d):
         return
     paths = []
     for p in [ "${FILE_DIRNAME}/${PF}", "${FILE_DIRNAME}/${P}", "${FILE_DIRNAME}/${PN}", "${FILE_DIRNAME}/files", "${FILE_DIRNAME}" ]:
-	    paths.append(bb.data.expand(os.path.join(p, mach_arch), d))
+        paths.append(bb.data.expand(os.path.join(p, mach_arch), d))
     for s in bb.data.getVar('SRC_URI', d, 1).split():
         local = bb.data.expand(bb.fetch.localpath(s, d), d)
         for mp in paths:
============================================================
--- classes/ccache.inc	2e03176c6c7991b8e8f92e4a2fe083a1bd690677
+++ classes/ccache.inc	f1d610852ac82af25b0ef1fa7a7d53e4f71e1881
@@ -5,7 +5,7 @@ python () {
 CCACHE_DIR_TARGET = "${TMPDIR}/ccache"
 
 python () {
-	if not bb.data.inherits_class('native', d) and not bb.data.inherits_class('cross', d):
-		bb.data.setVar('CCACHE_DIR', '${CCACHE_DIR_TARGET}', d)
-		bb.data.setVarFlag('CCACHE_DIR', 'export', '1', d)
+    if not bb.data.inherits_class('native', d) and not bb.data.inherits_class('cross', d):
+        bb.data.setVar('CCACHE_DIR', '${CCACHE_DIR_TARGET}', d)
+        bb.data.setVarFlag('CCACHE_DIR', 'export', '1', d)
 }
============================================================
--- classes/ccdv.bbclass	0849548a0f861230765044eb99fff1f4c714ed3d
+++ classes/ccdv.bbclass	0c353bbcc303df15f38c410ebe50655f0b4c8c39
@@ -1,10 +1,10 @@ python () {
 python () {
-	if bb.data.getVar('PN', d, 1) in ['ccdv-native']:
-		if not bb.data.getVar('INHIBIT_DEFAULT_DEPS', d, 1):
-			bb.data.setVar("DEPENDS", '%s %s' % ("ccdv-native", bb.data.getVar("DEPENDS", d, 1) or ""), d)
-			bb.data.setVar("CC", '%s %s' % ("ccdv", bb.data.getVar("CC", d, 1) or ""), d)
-			bb.data.setVar("BUILD_CC", '%s %s' % ("ccdv", bb.data.getVar("BUILD_CC", d, 1) or ""), d)
-			bb.data.setVar("CCLD", '%s %s' % ("ccdv", bb.data.getVar("CCLD", d, 1) or ""), d)
+    if bb.data.getVar('PN', d, 1) in ['ccdv-native']:
+        if not bb.data.getVar('INHIBIT_DEFAULT_DEPS', d, 1):
+            bb.data.setVar("DEPENDS", '%s %s' % ("ccdv-native", bb.data.getVar("DEPENDS", d, 1) or ""), d)
+            bb.data.setVar("CC", '%s %s' % ("ccdv", bb.data.getVar("CC", d, 1) or ""), d)
+            bb.data.setVar("BUILD_CC", '%s %s' % ("ccdv", bb.data.getVar("BUILD_CC", d, 1) or ""), d)
+            bb.data.setVar("CCLD", '%s %s' % ("ccdv", bb.data.getVar("CCLD", d, 1) or ""), d)
 }
 
 def quiet_libtool(bb,d):
============================================================
--- classes/update-alternatives.bbclass	bb1e120963bfcd8e1ce95ab8abf3d22f86450925
+++ classes/update-alternatives.bbclass	fffc783f607f570749f319a888a3b4a1aad84d34
@@ -10,7 +10,7 @@ update-alternatives --remove ${ALTERNATI
 update-alternatives --remove ${ALTERNATIVE_NAME} ${ALTERNATIVE_PATH}
 }
 
-def updatealternativesafterparse(d):
+def update_alternatives_after_parse(d):
     import bb
     if bb.data.getVar('ALTERNATIVE_NAME', d) == None:
         raise bb.build.FuncFailed, "%s inherits update-alternatives but doesn't set ALTERNATIVE_NAME" % bb.data.getVar('FILE', d)
@@ -18,7 +18,7 @@ python __anonymous() {
         raise bb.build.FuncFailed, "%s inherits update-alternatives but doesn't set ALTERNATIVE_PATH" % bb.data.getVar('FILE', d)
 
 python __anonymous() {
-    updatealternativesafterparse(d)
+    update_alternatives_after_parse(d)
 }
 
 python populate_packages_prepend () {
============================================================
--- classes/update-rc.d.bbclass	426fa6a0f46eb899a61e0f53f9f1f30b89668ba3
+++ classes/update-rc.d.bbclass	8812f2d73cbeef9536c5598c2f3c1888e35b0aa3
@@ -30,10 +30,10 @@ def update_rc_after_parse(d):
 def update_rc_after_parse(d):
     import bb
     if bb.data.getVar('INITSCRIPT_PACKAGES', d) == None:
-	    if bb.data.getVar('INITSCRIPT_NAME', d) == None:
-		    raise bb.build.FuncFailed, "%s inherits update-rc.d but doesn't set INITSCRIPT_NAME" % bb.data.getVar('FILE', d)
-	    if bb.data.getVar('INITSCRIPT_PARAMS', d) == None:
-		    raise bb.build.FuncFailed, "%s inherits update-rc.d but doesn't set INITSCRIPT_PARAMS" % bb.data.getVar('FILE', d)
+        if bb.data.getVar('INITSCRIPT_NAME', d) == None:
+            raise bb.build.FuncFailed, "%s inherits update-rc.d but doesn't set INITSCRIPT_NAME" % bb.data.getVar('FILE', d)
+        if bb.data.getVar('INITSCRIPT_PARAMS', d) == None:
+            raise bb.build.FuncFailed, "%s inherits update-rc.d but doesn't set INITSCRIPT_PARAMS" % bb.data.getVar('FILE', d)
 
 python __anonymous() {
     update_rc_after_parse(d)