From 92093162afdc1c59926f0f15d421f22952b02b19 Mon Sep 17 00:00:00 2001 From: JF Ding Date: Fri, 16 Dec 2011 10:58:09 +0800 Subject: [PATCH] cleanup all trailing spaces in code --- README.rst | 4 ++-- mic/imager/fs.py | 12 ++++++------ plugins/backend/zypppkgmgr.py | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.rst b/README.rst index c5cfc31..7a805e5 100644 --- a/README.rst +++ b/README.rst @@ -145,7 +145,7 @@ to process the installation. Configuration file ================== The configure file for mic can be provided as `/etc/mic/mic.conf`, where you -can specify the global settings. +can specify the global settings. The blow is the content of one sample file: :: [common] @@ -168,7 +168,7 @@ The blow is the content of one sample file: :: ; settings for chroot subcommand In this configuration file, there are four sections: [common] is for general -setting, and [create] [convert] [chroot] sections are for the options of +setting, and [create] [convert] [chroot] sections are for the options of corresponding mic subcommands: create, convert, and chroot. In the [create] section, the following values can be specified: diff --git a/mic/imager/fs.py b/mic/imager/fs.py index 66348e0..456267a 100644 --- a/mic/imager/fs.py +++ b/mic/imager/fs.py @@ -32,12 +32,12 @@ class FsImageCreator(BaseImageCreator): self._include_src = False def package(self, destdir = "."): - + ignores = ["/dev/fd", "/dev/stdin", "/dev/stdout", "/dev/stderr", "/etc/mtab"] if not os.path.exists(destdir): os.makedirs(destdir) - + if self._recording_pkgs: self._save_recording_pkgs(destdir) @@ -52,7 +52,7 @@ class FsImageCreator(BaseImageCreator): os.unlink(fsdir + exclude) self.outimage.append(fsdir) - + elif self._img_compression_method == "tar.bz2": dst = "%s/%s.tar.bz2" % (destdir, self.name) msger.info("Creating %s (compressing %s with %s). Please wait..." % (dst, self._instroot, self._img_compression_method)) @@ -62,11 +62,11 @@ class FsImageCreator(BaseImageCreator): for ignore_entry in ignores: if ignore_entry.startswith('/'): ignore_entry = ignore_entry[1:] - + tar_cmdline.append("--exclude=%s" % (ignore_entry)) - + tar_cmdline.extend(["-cjf", dst, "."]) - + rc = call(tar_cmdline) if rc: raise CreatorError("Failed compress image with tar.bz2. Cmdline: %s" % (" ".join(tar_cmdline))) diff --git a/plugins/backend/zypppkgmgr.py b/plugins/backend/zypppkgmgr.py index 4a23fb2..4367292 100644 --- a/plugins/backend/zypppkgmgr.py +++ b/plugins/backend/zypppkgmgr.py @@ -145,7 +145,7 @@ class Zypp(BackendPlugin): pi.status().setToBeInstalled (zypp.ResStatus.USER) else: obs.status().setToBeInstalled (zypp.ResStatus.USER) - + found = False startx = pkg.startswith("*") endx = pkg.endswith("*") -- 2.7.4