Merge "fixed wrong usage of rstrip in loop.py"

mic/bootstrap.py

@@ -82,7 +82,7 @@ def _setRootdir(self, name):
 
     def _getRootdir(self):
         if not os.path.exists(self._rootdir):
-            raise errors.BootstrapError("Root dir: %s not exist" % self._rootdir)
+            raise errors.BootstrapError("dir: %s not exist" % self._rootdir)
         return self._rootdir
 
     rootdir = property(fget = lambda self: self._getRootdir(),
@@ -95,7 +95,8 @@ def _setPkgmgr(self, name):
             if key == name:
                 self._pkgmgr = cls
         if not self._pkgmgr:
-            raise errors.BootstrapError("Backend: %s can't be loaded correctly" % name)
+            raise errors.BootstrapError("Backend: %s can't be loaded correctly"\
+                                        % name)
 
     pkgmgr = property(fget = lambda self: self._pkgmgr,
                       fset = lambda self, name: self._setPkgmgr(name),
@@ -190,8 +191,9 @@ def create(self, name, repolist, **kwargs):
         pkg_manager.setup()
 
         for repo in repolist:
-            if 'proxy' in repo.keys():
-                pkg_manager.addRepository(repo['name'], repo['baseurl'], proxy = repo['proxy'])
+            if 'proxy' in repo:
+                pkg_manager.addRepository(repo['name'], repo['baseurl'],
+                                          proxy=repo['proxy'])
             else:
                 pkg_manager.addRepository(repo['name'], repo['baseurl'])
 
@@ -225,8 +227,9 @@ def create(self, name, repolist, **kwargs):
         shutil.rmtree(destdir, ignore_errors = True)
         shutil.copytree(srcdir, destdir)
         # create '/tmp' in chroot
-        if not os.path.exists(os.path.join(os.path.abspath(self.rootdir), "tmp")):
-            os.makedirs(os.path.join(os.path.abspath(self.rootdir), "tmp"))
+        _tmpdir = os.path.join(os.path.abspath(self.rootdir), "tmp")
+        if not os.path.exists(_tmpdir):
+            os.makedirs(_tmpdir)
 
         msger.info("Bootstrap created.")
 
@@ -242,14 +245,17 @@ def mychroot():
 
         shutil.copyfile("/etc/resolv.conf", chrootdir + "/etc/resolv.conf")
         try:
-            subprocess.call("zypper -n --no-gpg-checks update", preexec_fn=mychroot, shell=True)
+            subprocess.call("zypper -n --no-gpg-checks update",
+                            preexec_fn=mychroot, shell=True)
         except OSError, err:
-            raise errors.BootstrapError("Bootstrap: %s Update fail" % chrootdir)
+            raise errors.BootstrapError("Bootstrap: %s update failed" %\
+                                        chrootdir)
 
     def cleanup(self, name):
         self.rootdir = name
         try:
             chroot.cleanup_mounts(self.rootdir)
             shutil.rmtree(self.rootdir, ignore_errors=True)
         except:
-            raise errors.BootstrapError("Bootstrap: %s clean up fail " % self.rootdir)
+            raise errors.BootstrapError("Bootstrap: %s clean up failed" %\
+                                        self.rootdir)

mic/chroot.py

@@ -144,18 +144,21 @@ def get_bind_mounts(chrootdir, bindmounts):
 
         """Default bind mounts"""
         for pt in BIND_MOUNTS:
-            chrootmounts.append(fs_related.BindChrootMount(pt, chrootdir, None))
+            chrootmounts.append(fs_related.BindChrootMount(pt,
+                                                           chrootdir,
+                                                           None))
 
         chrootmounts.append(fs_related.BindChrootMount("/",
                                                        chrootdir,
                                                        "/parentroot",
                                                        "ro"))
 
         for kernel in os.listdir("/lib/modules"):
-            chrootmounts.append(fs_related.BindChrootMount("/lib/modules/"+kernel,
-                                                           chrootdir,
-                                                           None,
-                                                           "ro"))
+            chrootmounts.append(fs_related.BindChrootMount(
+                                                "/lib/modules/"+kernel,
+                                                chrootdir,
+                                                None,
+                                                "ro"))
 
         return chrootmounts
 

mic/conf.py

@@ -175,9 +175,11 @@ def _parse_siteconf(self, siteconf):
 
                     if val.split(':')[0] in ('file', 'http', 'https', 'ftp'):
                         if repostr.has_key(option):
-                            repostr[option] += "name:%s,baseurl:%s," % (option, val)
+                            repostr[option] += "name:%s,baseurl:%s," % \
+                                                (option, val)
                         else:
-                            repostr[option]  = "name:%s,baseurl:%s," % (option, val)
+                            repostr[option]  = "name:%s,baseurl:%s," % \
+                                                (option, val)
                         continue
 
                 self.bootstraps[name] = repostr

mic/creator.py

@@ -52,7 +52,8 @@ def __init__(self, *args, **kwargs):
 
     def get_optparser(self):
         optparser = cmdln.CmdlnOptionParser(self)
-        optparser.add_option('-d', '--debug', action='store_true', dest='debug',
+        optparser.add_option('-d', '--debug', action='store_true',
+                             dest='debug',
                              help=SUPPRESS_HELP)
         optparser.add_option('-v', '--verbose', action='store_true',
                              dest='verbose',
@@ -127,7 +128,7 @@ def preoptparse(self, argv):
                     try:
                         largs.append(argv.pop(0))
                     except IndexError:
-                        raise errors.Usage("%s option requires an argument" % arg)
+                        raise errors.Usage("option %s requires arguments" % arg)
 
             else:
                 if arg.startswith("--"):
@@ -169,6 +170,7 @@ def postoptparse(self):
         if self.options.cachedir is not None:
             configmgr.create['cachedir'] = abspath(self.options.cachedir)
         os.environ['ZYPP_LOCKFILE_ROOT'] = configmgr.create['cachedir']
+
         if self.options.local_pkgs_path is not None:
             if not os.path.exists(self.options.local_pkgs_path):
                 msger.error('Local pkgs directory: \'%s\' not exist' \

mic/imager/baseimager.py

@@ -135,7 +135,7 @@ def __init__(self, createopts = None, pkgmgr = None):
 
         # No ks provided when called by convertor, so skip the dependency check
         if self.ks:
-            # If we have btrfs partition we need to check that we have toosl for those
+            # If we have btrfs partition we need to check necessary tools
             for part in self.ks.handler.partition.partitions:
                 if part.fstype and part.fstype == "btrfs":
                     self._dep_checks.append("mkfs.btrfs")
@@ -1232,7 +1232,6 @@ def copy_kernel(self):
 
     def copy_attachment(self):
         """ Subclass implement it to handle attachment files
-
         NOTE: This needs to be called before unmounting the instroot.
         """
         pass

mic/imager/livecd.py

@@ -63,7 +63,8 @@ def __init__(self, creatoropts = None, pkgmgr = None):
 
         #The default kernel type from kickstart.
         if self.ks:
-            self._default_kernel = kickstart.get_default_kernel(self.ks, "kernel")
+            self._default_kernel = kickstart.get_default_kernel(self.ks,
+                                                                "kernel")
         else:
             self._default_kernel = None
 
@@ -717,6 +718,5 @@ def _configure_bootloader(self, isodir):
     LiveCDImageCreator = x86LiveImageCreator
 elif arch.startswith("arm"):
     LiveCDImageCreator = LiveImageCreatorBase
-
 else:
     raise CreatorError("Architecture not supported!")

mic/imager/loop.py

@@ -378,7 +378,8 @@ def _stage_final_image(self):
             misc.packing(dstfile, self.__imgdir)
 
         if self.pack_to:
-            mountfp_xml = os.path.splitext(self.pack_to)[0].rstrip('.tar') + ".xml"
+            mountfp_xml = os.path.splitext(self.pack_to)[0]
+            mountfp_xml = misc.strip_end(mountfp_xml, '.tar') + ".xml"
         else:
             mountfp_xml = self.name + ".xml"
         # save mount points mapping file to xml

mic/imager/raw.py

@@ -103,7 +103,7 @@ def _get_fstab(self):
         return s
 
     def _create_mkinitrd_config(self):
-        #write  to tell which modules to be included in initrd
+        """write to tell which modules to be included in initrd"""
 
         mkinitrd = ""
         mkinitrd += "PROBE=\"no\"\n"
@@ -442,7 +442,7 @@ def _write_image_xml(self):
                                  % (self.name,
                                     name,
                                     self.__disk_format))
-                xml += "    <disk file='%s-%s.%s' use='system' format='%s'>\n" \
+                xml += "    <disk file='%s-%s.%s' use='system' format='%s'>\n"\
                        % (self.name,
                           name,
                           self.__disk_format,

mic/pluginbase.py

@@ -44,7 +44,10 @@ class ImagerPlugin(_Plugin):
     mic_plugin_type = "imager"
 
     @classmethod
-    def check_image_exists(self, destdir, apacking=None, images=[], release=None):
+    def check_image_exists(self, destdir, apacking=None,
+                                          images=[],
+                                          release=None):
+
         # if it's a packing file, reset images
         if apacking:
             images = [apacking]

mic/rt_util.py

@@ -58,7 +58,7 @@ def runmic_in_runtime(runmode, opts, ksfile, argv=None):
             #repostrs = misc.get_repostrs_from_ks(opts['ks'])
             #for item in repostrs:
             #    repolist.append(convert_repostr(item))
-            msger.info("Failed to find propery bootstrap, please check config file")
+            msger.info("cannot find valid bootstrap, please check the config")
             msger.info("Back to native running")
             return
         else:
@@ -129,7 +129,8 @@ def runmic_in_bootstrap(name, argv, opts, ksfile, repolist):
     bootstrap_lst = bootstrap_env.bootstraps
     setattr(bootstrap_env, 'rootdir', name)
     if not bootstrap_lst or not name in bootstrap_lst:
-        msger.info("Creating bootstrap %s under %s" %  (name, bootstrap_env.homedir))
+        msger.info("Creating bootstrap %s under %s" % \
+                   (name, bootstrap_env.homedir))
         bootstrap_env.create(name, repolist)
 
     msger.info("Use bootstrap: %s" % bootstrap_env.rootdir)
@@ -155,7 +156,8 @@ def runmic_in_bootstrap(name, argv, opts, ksfile, repolist):
     # make unique and remain the original order
     lst = sorted(set(lst), key=lst.index)
 
-    bindmounts = ';'.join(map(lambda p: os.path.abspath(os.path.expanduser(p)), lst))
+    bindmounts = ';'.join(map(lambda p: os.path.abspath(os.path.expanduser(p)),
+                              lst))
 
     msger.info("Start mic command in bootstrap")
     bootstrap_env.run(name, argv, cwd, bindmounts)