Fix bad indentations.
authorHuang Hao <hao.h.huang@intel.com>
Wed, 27 Feb 2013 07:10:35 +0000 (15:10 +0800)
committerHuang Hao <hao.h.huang@intel.com>
Wed, 27 Feb 2013 07:10:35 +0000 (15:10 +0800)
Change-Id: I6a1b15a130576c87a85db864ec3997b7c3005f05

plugins/backend/yumpkgmgr.py
plugins/backend/zypppkgmgr.py
plugins/imager/fs_plugin.py
plugins/imager/livecd_plugin.py
plugins/imager/liveusb_plugin.py

index 95690c6..955f813 100644 (file)
@@ -78,12 +78,12 @@ class MyYumRepository(yum.yumRepo.YumRepository):
 
         proxy = None
         if url:
-             proxy = get_proxy_for(url)
+            proxy = get_proxy_for(url)
         else:
-             proxy = get_proxy_for(self.urls[0])
+            proxy = get_proxy_for(self.urls[0])
 
         if proxy:
-             self.proxy = str(proxy)
+            self.proxy = str(proxy)
 
         size = int(size) if size else None
         rvalue = super(MyYumRepository, self)._getFile(url,
index 0d02ad8..16ba467 100755 (executable)
@@ -278,9 +278,9 @@ class Zypp(BackendPlugin):
                         return True;
             else:
                 if startx and name.endswith(pkg[1:]):
-                        return True;
+                    return True;
                 if endx and name.startswith(pkg[:-1]):
-                        return True;
+                    return True;
 
         return False;
 
@@ -883,8 +883,8 @@ class Zypp(BackendPlugin):
 
     def _add_prob_flags(self, *flags):
         for flag in flags:
-           if flag not in self.probFilterFlags:
-               self.probFilterFlags.append(flag)
+            if flag not in self.probFilterFlags:
+                self.probFilterFlags.append(flag)
 
     def get_proxies(self, pobj):
         if not pobj:
index 8a5a548..8e758db 100644 (file)
@@ -129,16 +129,15 @@ class FsPlugin(ImagerPlugin):
 
     @classmethod
     def do_chroot(self, target, cmd=[]):#chroot.py parse opts&args
-            try:
-                if len(cmd) != 0:
-                    cmdline = ' '.join(cmd)
-                else:
-                    cmdline = "/bin/bash"
-                envcmd = fs_related.find_binary_inchroot("env", target)
-                if envcmd:
-                    cmdline = "%s HOME=/root %s" % (envcmd, cmdline)
-                chroot.chroot(target, None, cmdline)
-            finally:
-                chroot.cleanup_after_chroot("dir", None, None, None)
-                return 1
-
+        try:
+            if len(cmd) != 0:
+                cmdline = ' '.join(cmd)
+            else:
+                cmdline = "/bin/bash"
+            envcmd = fs_related.find_binary_inchroot("env", target)
+            if envcmd:
+                cmdline = "%s HOME=/root %s" % (envcmd, cmdline)
+            chroot.chroot(target, None, cmdline)
+        finally:
+            chroot.cleanup_after_chroot("dir", None, None, None)
+            return 1
index 93479e2..d24ef59 100644 (file)
@@ -175,7 +175,7 @@ class LiveCDPlugin(ImagerPlugin):
             try:
                 subprocess.call(args, preexec_fn = instance._chroot)
             except OSError, (err, msg):
-               raise errors.CreatorError("Failed to execute /usr/libexec/mkliveinitrd: %s" % msg)
+                raise errors.CreatorError("Failed to execute /usr/libexec/mkliveinitrd: %s" % msg)
 
         def __run_post_cleanups(instance):
             kernelver = instance._get_kernel_versions().values()[0][0]
@@ -184,7 +184,7 @@ class LiveCDPlugin(ImagerPlugin):
             try:
                 subprocess.call(args, preexec_fn = instance._chroot)
             except OSError, (err, msg):
-               raise errors.CreatorError("Failed to run post cleanups: %s" % msg)
+                raise errors.CreatorError("Failed to run post cleanups: %s" % msg)
 
         convertoropts = configmgr.convert
         convertoropts['name'] = os.path.splitext(os.path.basename(base_on))[0]
index f239a1a..7aa8927 100644 (file)
@@ -177,7 +177,7 @@ class LiveUSBPlugin(ImagerPlugin):
                 subprocess.call(args, preexec_fn = instance._chroot)
 
             except OSError, (err, msg):
-               raise errors.CreatorError("Failed to execute /usr/libexec/mkliveinitrd: %s" % msg)
+                raise errors.CreatorError("Failed to execute /usr/libexec/mkliveinitrd: %s" % msg)
 
         def __run_post_cleanups(instance):
             kernelver = instance._get_kernel_versions().values()[0][0]
@@ -186,7 +186,7 @@ class LiveUSBPlugin(ImagerPlugin):
             try:
                 subprocess.call(args, preexec_fn = instance._chroot)
             except OSError, (err, msg):
-               raise errors.CreatorError("Failed to run post cleanups: %s" % msg)
+                raise errors.CreatorError("Failed to run post cleanups: %s" % msg)
 
         convertoropts = configmgr.convert
         convertoropts['name'] = os.path.splitext(os.path.basename(base_on))[0]