classes: Standardise whitespace in anonymous python methods and factor out functions for more efficent use by bitbake (as also patched in OE)

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

1 files changed, 37 insertions, 33 deletions

diff --git a/meta/classes/update-rc.d.bbclass b/meta/classes/update-rc.d.bbclass
index 0bfba467c1..df0d62c2c5 100644
--- a/meta/classes/update-rc.d.bbclass
+++ b/meta/classes/update-rc.d.bbclass
@@ -26,44 +26,48 @@ updatercd_postrm() {
 update-rc.d $D ${INITSCRIPT_NAME} remove
 }
 
+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)
+
 python __anonymous() {
-        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)
+    update_rc_after_parse(d)
 }
 
 python populate_packages_prepend () {
-        def update_rcd_package(pkg):
-                bb.debug(1, 'adding update-rc.d calls to postinst/postrm for %s' % pkg)
-                localdata = bb.data.createCopy(d)
-                overrides = bb.data.getVar("OVERRIDES", localdata, 1)
-                bb.data.setVar("OVERRIDES", "%s:%s" % (pkg, overrides), localdata)
-                bb.data.update_data(localdata)
+    def update_rcd_package(pkg):
+         bb.debug(1, 'adding update-rc.d calls to postinst/postrm for %s' % pkg)
+         localdata = bb.data.createCopy(d)
+         overrides = bb.data.getVar("OVERRIDES", localdata, 1)
+         bb.data.setVar("OVERRIDES", "%s:%s" % (pkg, overrides), localdata)
+         bb.data.update_data(localdata)
 
-                postinst = bb.data.getVar('pkg_postinst', localdata, 1)
-                if not postinst:
-                        postinst = '#!/bin/sh\n'
-                postinst += bb.data.getVar('updatercd_postinst', localdata, 1)
-                bb.data.setVar('pkg_postinst_%s' % pkg, postinst, d)
-                prerm = bb.data.getVar('pkg_prerm', localdata, 1)
-                if not prerm:
-                        prerm = '#!/bin/sh\n'
-                prerm += bb.data.getVar('updatercd_prerm', localdata, 1)
-                bb.data.setVar('pkg_prerm_%s' % pkg, prerm, d)
-                postrm = bb.data.getVar('pkg_postrm', localdata, 1)
-                if not postrm:
-                        postrm = '#!/bin/sh\n'
+         postinst = bb.data.getVar('pkg_postinst', localdata, 1)
+         if not postinst:
+             postinst = '#!/bin/sh\n'
+         postinst += bb.data.getVar('updatercd_postinst', localdata, 1)
+         bb.data.setVar('pkg_postinst_%s' % pkg, postinst, d)
+         prerm = bb.data.getVar('pkg_prerm', localdata, 1)
+         if not prerm:
+             prerm = '#!/bin/sh\n'
+         prerm += bb.data.getVar('updatercd_prerm', localdata, 1)
+         bb.data.setVar('pkg_prerm_%s' % pkg, prerm, d)
+            postrm = bb.data.getVar('pkg_postrm', localdata, 1)
+            if not postrm:
+                    postrm = '#!/bin/sh\n'
                 postrm += bb.data.getVar('updatercd_postrm', localdata, 1)
-                bb.data.setVar('pkg_postrm_%s' % pkg, postrm, d)
+         bb.data.setVar('pkg_postrm_%s' % pkg, postrm, d)
 
-        pkgs = bb.data.getVar('INITSCRIPT_PACKAGES', d, 1)
-        if pkgs == None:
-                pkgs = bb.data.getVar('PN', d, 1)
-                packages = (bb.data.getVar('PACKAGES', d, 1) or "").split()
-                if not pkgs in packages and packages != []:
-                        pkgs = packages[0]
-        for pkg in pkgs.split():
-                update_rcd_package(pkg)
+    pkgs = bb.data.getVar('INITSCRIPT_PACKAGES', d, 1)
+    if pkgs == None:
+         pkgs = bb.data.getVar('PN', d, 1)
+         packages = (bb.data.getVar('PACKAGES', d, 1) or "").split()
+         if not pkgs in packages and packages != []:
+             pkgs = packages[0]
+    for pkg in pkgs.split():
+         update_rcd_package(pkg)
 }