Indentation fixups, caught by python -t

Signed-off-by: Chris Larson <chris_larson@mentor.com>

diff --git a/classes/cpan-base.bbclass b/classes/cpan-base.bbclass
index d65b5d9..379defa 100644 (file)
--- a/classes/cpan-base.bbclass
+++ b/classes/cpan-base.bbclass
@@ -10,7 +10,7 @@ RDEPENDS  += "${@["perl", ""][(bb.data.inherits_class('native', d))]}"
 # Determine the staged version of perl from the perl configuration file
 def get_perl_version(d):
        import re
-       cfg = bb.data.expand('${STAGING_LIBDIR}/perl/config.sh', d)
+       cfg = bb.data.expand('${STAGING_LIBDIR}/perl/config.sh', d)
        try:
                f = open(cfg, 'r')
        except IOError:

diff --git a/classes/kernel-arch.bbclass b/classes/kernel-arch.bbclass
index 8894fa5..58c8374 100644 (file)
--- a/classes/kernel-arch.bbclass
+++ b/classes/kernel-arch.bbclass
@@ -7,12 +7,12 @@
 valid_archs = "alpha cris ia64 \
                x86_64 i386 x86 \
                m68knommu m68k ppc powerpc ppc64  \
-              sparc sparc64 \
+               sparc sparc64 \
                arm  arm26 \
                m32r mips \
-              sh sh64 um h8300   \
-              parisc s390  v850 \
-              avr32 blackfin"
+               sh sh64 um h8300   \
+               parisc s390  v850 \
+               avr32 blackfin"
 
 def map_kernel_arch(a, d):
        import re
@@ -25,7 +25,7 @@ def map_kernel_arch(a, d):
        elif re.match('mipsel$', a):            return 'mips'
        elif re.match('sh(3|4)$', a):           return 'sh'
        elif re.match('bfin', a):               return 'blackfin'
-        elif a in valid_archs:                 return a
+       elif a in valid_archs:                  return a
        else:
                bb.error("cannot map '%s' to a linux kernel architecture" % a)
 

diff --git a/classes/package.bbclass b/classes/package.bbclass
index 77a20bf..c378133 100644 (file)
--- a/classes/package.bbclass
+++ b/classes/package.bbclass
@@ -1029,23 +1029,23 @@ def package_run_hooks(f, d):
                                bb.parse.parse_py.BBHandler.feeder(line, l, fn, os.path.basename(fn), d)
                                line += 1
                        fp.close()
-                       anonqueue = bb.data.getVar("__anonqueue", d, True) or []
-                       body = [x['content'] for x in anonqueue]
-                       flag = { 'python' : 1, 'func' : 1 }
-                       bb.data.setVar("__anonfunc", "\n".join(body), d)
-                       bb.data.setVarFlags("__anonfunc", flag, d)
-                       try:
-                               t = bb.data.getVar('T', d)
-                               bb.data.setVar('T', '${TMPDIR}/', d)
-                               bb.build.exec_func("__anonfunc", d)
-                               bb.data.delVar('T', d)
-                               if t:
-                                       bb.data.setVar('T', t, d)
-                       except Exception, e:
-                               bb.msg.debug(1, bb.msg.domain.Parsing, "Exception when executing anonymous function: %s" % e)
-                               raise
-                       bb.data.delVar("__anonqueue", d)
-                       bb.data.delVar("__anonfunc", d)
+                       anonqueue = bb.data.getVar("__anonqueue", d, True) or []
+                       body = [x['content'] for x in anonqueue]
+                       flag = { 'python' : 1, 'func' : 1 }
+                       bb.data.setVar("__anonfunc", "\n".join(body), d)
+                       bb.data.setVarFlags("__anonfunc", flag, d)
+                       try:
+                               t = bb.data.getVar('T', d)
+                               bb.data.setVar('T', '${TMPDIR}/', d)
+                               bb.build.exec_func("__anonfunc", d)
+                               bb.data.delVar('T', d)
+                               if t:
+                                       bb.data.setVar('T', t, d)
+                       except Exception, e:
+                               bb.msg.debug(1, bb.msg.domain.Parsing, "Exception when executing anonymous function: %s" % e)
+                               raise
+                       bb.data.delVar("__anonqueue", d)
+                       bb.data.delVar("__anonfunc", d)
 
 python package_do_package () {
        packages = (bb.data.getVar('PACKAGES', d, True) or "").split()

diff --git a/classes/packaged-staging.bbclass b/classes/packaged-staging.bbclass
index 8a98940..09e86ae 100644 (file)
--- a/classes/packaged-staging.bbclass
+++ b/classes/packaged-staging.bbclass
@@ -259,8 +259,8 @@ python packagestage_scenefunc () {
 
         # Remove the stamps and files we added above
         # FIXME - we should really only remove the stamps we added
-       for fname in glob.glob(stamp + '.*'):
-           oe.path.remove(fname)
+        for fname in glob.glob(stamp + '.*'):
+            oe.path.remove(fname)
 
         oe.path.remove(bb.data.expand("${WORKDIR}/tstage", d))
         if stageok:
@@ -295,8 +295,8 @@ python packagedstage_stampfixing_eventhandler() {
                     # so we need to remove the autogenerated stamps.
                     for task in taskscovered:
                         covered = "%s.do_%s" % (e.stampPrefix[fn], task)
-                       oe.path.remove(covered)
-                   oe.path.remove(stamp)
+                        oe.path.remove(covered)
+                    oe.path.remove(stamp)
 }
 
 populate_sysroot_preamble () {

diff --git a/classes/sanity.bbclass b/classes/sanity.bbclass
index dfb3010..8eb7453 100644 (file)
--- a/classes/sanity.bbclass
+++ b/classes/sanity.bbclass
@@ -141,7 +141,7 @@ def check_sanity(e):
                if not abi.isdigit():
                        f = file(abifile, "w")
                        f.write(current_abi)
-                elif abi == "3" and current_abi == "4":
+               elif abi == "3" and current_abi == "4":
                        import bb
                        bb.note("Converting staging from layout version 2 to layout version 3")
                        os.system(bb.data.expand("mv ${TMPDIR}/staging ${TMPDIR}/sysroots", e.data))

diff --git a/classes/siteinfo.bbclass b/classes/siteinfo.bbclass
index d7f2705..76a86c0 100644 (file)
--- a/classes/siteinfo.bbclass
+++ b/classes/siteinfo.bbclass
@@ -47,7 +47,7 @@ def get_siteinfo_list(d):
                "i486-mingw32":            "endian-little bit-32 common-mingw ix86-common",\
                "i586-mingw32":            "endian-little bit-32 common-mingw ix86-common",\
                "i686-mingw32":            "endian-little bit-32 common-mingw ix86-common",\
-              "ia64-linux":              "endian-little bit-64 common-linux common-glibc",\
+               "ia64-linux":             "endian-little bit-64 common-linux common-glibc",\
                "mipsel-linux":            "endian-little bit-32 common-linux common-glibc mips-common",\
                "mipsel-linux-uclibc":     "endian-little bit-32 common-linux common-uclibc mips-common",\
                "mips-linux":              "endian-big bit-32 common-linux common-glibc mips-common",\
@@ -55,8 +55,8 @@ def get_siteinfo_list(d):
                "powerpc-darwin":          "endian-big bit-32 common-darwin",\
                "ppc-linux":               "endian-big bit-32 common-linux common-glibc powerpc-common powerpc-linux",\
                "ppc64-linux":             "endian-big bit-64 common-linux common-glibc powerpc-common powerpc64-linux",\
-              "powerpc-linux":           "endian-big bit-32 common-linux common-glibc powerpc-common",\
-              "powerpc-linux-gnuspe":       "endian-big bit-32 common-linux common-glibc powerpc-common powerpc-linux",\
+               "powerpc-linux":           "endian-big bit-32 common-linux common-glibc powerpc-common",\
+               "powerpc-linux-gnuspe":       "endian-big bit-32 common-linux common-glibc powerpc-common powerpc-linux",\
                "powerpc-linux-uclibc":    "endian-big bit-32 common-linux common-uclibc powerpc-common",\
                "powerpc-linux-uclibcspe": "endian-big bit-32 common-linux common-uclibc powerpc-common powerpc-linux-uclibc",\
                "sh3-linux":               "endian-little bit-32 common-linux common-glibc sh-common",\

diff --git a/conf/distro/include/sane-toolchain.inc b/conf/distro/include/sane-toolchain.inc
index 1b77f75..f61d218 100644 (file)
--- a/conf/distro/include/sane-toolchain.inc
+++ b/conf/distro/include/sane-toolchain.inc
@@ -141,7 +141,7 @@ ENABLE_BINARY_LOCALE_GENERATION_armv7a = "0"
 #qemu has taken a dislike to armeb as well
 ENABLE_BINARY_LOCALE_GENERATION_armeb = "0"
 def detect_arm_abi (d):
-       import bb
+       import bb
        if bb.data.getVar('DISTRO_FEATURES',d) is None:
                if bb.data.getVar('TARGET_ARCH', d, 1) in [ 'arm', 'armeb' ]:
                        return "oabi"
@@ -159,8 +159,8 @@ def compute_os_portion_of_target_triplet (d):
        armv5te iwmmxt armv7a armv7 armv5teb armv4t"
        ppc_spe_supporting_arches = "ppce500v2 ppce500"
        gnu_suffix = ""
-       if bb.data.getVar('LIBC', d, 1) == "uclibc":
-               libc_suffix = "uclibc"
+       if bb.data.getVar('LIBC', d, 1) == "uclibc":
+               libc_suffix = "uclibc"
        else:
                libc_suffix = ""
        
@@ -170,7 +170,7 @@ def compute_os_portion_of_target_triplet (d):
                else:
                        os_suffix = "uclinux"
        else:
-               os_suffix = "linux"
+               os_suffix = "linux"
        bparch = bb.data.getVar('BASE_PACKAGE_ARCH', d,1)
 
        if bb.data.getVar('DISTRO_FEATURES',d,1) is not None and \