Fix up problems pointed out by pylint.

Signed-off-by: Chris Lalancette <[email protected]>

Author: clalancette

oz/Debian.py

@@ -495,8 +495,7 @@ def do_customize(self, guestaddr):
 
         if packstr != '':
             self.guest_execute_command(guestaddr,
-                                       'apt-get install -y %s' % (packstr),
-                                       tunnels=None)
+                                       'apt-get install -y %s' % (packstr))
 
         self._customize_files(guestaddr)
 
@@ -552,7 +551,7 @@ def _get_kernel_from_txt_cfg(self, fetchurl):
             raise oz.OzException.OzException("Could not find %s" % (txtcfgurl))
 
         txtcfg = os.path.join(self.icicle_tmp, "txt.cfg")
-        self.log.debug("Going to write txt.cfg to %s" % (txtcfg))
+        self.log.debug("Going to write txt.cfg to %s", txtcfg)
         txtcfgfd = os.open(txtcfg, os.O_RDWR | os.O_CREAT | os.O_TRUNC)
         os.unlink(txtcfg)
         fp = os.fdopen(txtcfgfd)
@@ -580,7 +579,7 @@ def _get_kernel_from_txt_cfg(self, fetchurl):
         if kernel is None or initrd is None:
             raise oz.OzException.OzException("Empty kernel or initrd")
 
-        self.log.debug("Returning kernel %s and initrd %s" % (kernel, initrd))
+        self.log.debug("Returning kernel %s and initrd %s", kernel, initrd)
         return (kernel, initrd)
 
     def _gzip_file(self, inputfile, outputmode):
@@ -606,7 +605,7 @@ def _create_cpio_initrd(self, preseedpath):
         Internal method to create a modified CPIO initrd
         """
         extrafname = os.path.join(self.icicle_tmp, "extra.cpio")
-        self.log.debug("Writing cpio to %s" % (extrafname))
+        self.log.debug("Writing cpio to %s", extrafname)
         cpiofiledict = {}
         cpiofiledict[preseedpath] = 'preseed.cfg'
         oz.ozutil.write_cpio(cpiofiledict, extrafname)
@@ -631,30 +630,40 @@ def _initrd_inject_preseed(self, fetchurl, force_download):
             pass
 
         if kernel is None:
-            self.log.debug("Kernel was None, trying debian-installer/%s/linux" % (self.debarch))
+            self.log.debug("Kernel was None, trying debian-installer/%s/linux", self.debarch)
             # we couldn't find the kernel in the txt.cfg, so try a
             # hard-coded path
             kernel = "debian-installer/%s/linux" % (self.debarch)
         if initrd is None:
-            self.log.debug("Initrd was None, trying debian-installer/%s/initrd.gz" % (self.debarch))
+            self.log.debug("Initrd was None, trying debian-installer/%s/initrd.gz", self.debarch)
             # we couldn't find the initrd in the txt.cfg, so try a
             # hard-coded path
             initrd = "debian-installer/%s/initrd.gz" % (self.debarch)
 
-        self._get_original_media('/'.join([self.url.rstrip('/'),
-                                           kernel.lstrip('/')]),
-                                 self.kernelcache, force_download)
+        (fd, outdir) = self._open_locked_file(self.kernelcache)
 
         try:
             self._get_original_media('/'.join([self.url.rstrip('/'),
-                                               initrd.lstrip('/')]),
-                                     self.initrdcache, force_download)
-        except:
-            os.unlink(self.kernelfname)
-            raise
+                                               kernel.lstrip('/')]),
+                                     fd, outdir, force_download)
+
+            # if we made it here, then we can copy the kernel into place
+            shutil.copyfile(self.kernelcache, self.kernelfname)
+        finally:
+            os.close(fd)
+
+        (fd, outdir) = self._open_locked_file(self.initrdcache)
 
-        # if we made it here, then we can copy the kernel into place
-        shutil.copyfile(self.kernelcache, self.kernelfname)
+        try:
+            try:
+                self._get_original_media('/'.join([self.url.rstrip('/'),
+                                                   initrd.lstrip('/')]),
+                                         fd, outdir, force_download)
+            except:
+                os.unlink(self.kernelfname)
+                raise
+        finally:
+            os.close(fd)
 
         try:
             preseedpath = os.path.join(self.icicle_tmp, "preseed.cfg")

oz/Guest.py

@@ -516,7 +516,7 @@ def _generate_xml(self, bootdev, installdev, kernel=None, initrd=None,
         # install disk (if any)
         if not installdev:
             installdev_list = []
-        elif not type(installdev) is list:
+        elif not isinstance(installdev, list):
             installdev_list = [installdev]
         else:
             installdev_list = installdev

oz/Mageia.py

@@ -99,7 +99,7 @@ def _cfg_sub(line):
                 flags = "automatic=method:cdrom"
 
         with open(isolinuxcfg, 'w') as f:
-                f.write("""\
+            f.write("""\
 default customiso
 timeout 1
 prompt 0

oz/ozutil.py

@@ -22,7 +22,6 @@
 import os
 import random
 import subprocess
-import tempfile
 import errno
 import stat
 import shutil