image.bbclass: Cleanup whitespace (from poky)

diff --git a/classes/image.bbclass b/classes/image.bbclass
index 35080c1..af9d4a2 100644 (file)
--- a/classes/image.bbclass
+++ b/classes/image.bbclass
@@ -45,17 +45,17 @@ python () {
 # is searched for in the BBPATH (same as the old version.)
 #
 def get_devtable_list(d):
-       import bb
-       devtable = bb.data.getVar('IMAGE_DEVICE_TABLE', d, 1)
-       if devtable != None:
-               return devtable
-       str = ""
-       devtables = bb.data.getVar('IMAGE_DEVICE_TABLES', d, 1)
-       if devtables == None:
-               devtables = 'files/device_table-minimal.txt'
-       for devtable in devtables.split():
-               str += " %s" % bb.which(bb.data.getVar('BBPATH', d, 1), devtable)
-       return str
+    import bb
+    devtable = bb.data.getVar('IMAGE_DEVICE_TABLE', d, 1)
+    if devtable != None:
+        return devtable
+    str = ""
+    devtables = bb.data.getVar('IMAGE_DEVICE_TABLES', d, 1)
+    if devtables == None:
+        devtables = 'files/device_table-minimal.txt'
+    for devtable in devtables.split():
+        str += " %s" % bb.which(bb.data.getVar('BBPATH', d, 1), devtable)
+    return str
 
 IMAGE_POSTPROCESS_COMMAND ?= ""
 MACHINE_POSTPROCESS_COMMAND ?= ""
@@ -86,10 +86,10 @@ fakeroot do_rootfs () {
 
        rootfs_${IMAGE_PKGTYPE}_do_rootfs
 
-       insert_feed_uris        
+       insert_feed_uris
 
        ${IMAGE_PREPROCESS_COMMAND}
-               
+
        export TOPDIR=${TOPDIR}
        export DISTRO=${USERDISTRO}
        export MACHINE=${MACHINE}
@@ -122,19 +122,19 @@ do_deploy_to () {
 insert_feed_uris () {
        
        echo "Building feeds for [${DISTRO}].."
-               
+
        for line in ${FEED_URIS}
        do
                # strip leading and trailing spaces/tabs, then split into name and uri
                line_clean="`echo "$line"|sed 's/^[ \t]*//;s/[ \t]*$//'`"
                feed_name="`echo "$line_clean" | sed -n 's/\(.*\)##\(.*\)/\1/p'`"
-               feed_uri="`echo "$line_clean" | sed -n 's/\(.*\)##\(.*\)/\2/p'`"                                        
+               feed_uri="`echo "$line_clean" | sed -n 's/\(.*\)##\(.*\)/\2/p'`"
                
                echo "Added $feed_name feed with URL $feed_uri"
                
                # insert new feed-sources
                echo "src/gz $feed_name $feed_uri" >> ${IMAGE_ROOTFS}/etc/opkg/${feed_name}-feed.conf
-       done                    
+       done
 
        # Allow to use package deploy directory contents as quick devel-testing
        # feed. This creates individual feed configs for each arch subdir of those
@@ -162,7 +162,7 @@ log_check() {
                else
                        echo "Cannot find logfile [$lf_path]"
                fi
-               echo "Logfile is clean"         
+               echo "Logfile is clean"
        done
 
        set -x
@@ -173,7 +173,7 @@ log_check() {
 
 zap_root_password () {
        sed 's%^root:[^:]*:%root:*:%' < ${IMAGE_ROOTFS}/etc/passwd >${IMAGE_ROOTFS}/etc/passwd.new
-       mv ${IMAGE_ROOTFS}/etc/passwd.new ${IMAGE_ROOTFS}/etc/passwd    
+       mv ${IMAGE_ROOTFS}/etc/passwd.new ${IMAGE_ROOTFS}/etc/passwd
 } 
 
 create_etc_timestamp() {