From 899338c8d23721f3c953f13ab86b09e34626df7b Mon Sep 17 00:00:00 2001
From: Gui Chen <gui.chen@intel.com>
Date: Fri, 9 Aug 2013 02:45:28 -0400
Subject: [PATCH] fix pylint

W: 50,0:elf_arch: Dangerous default value ['/bin/bash', '/sbin/init'] as argument
C: 76,4:global_mounts.totuple: Missing docstring
C:126,8:bind_mount: Invalid name "b" for type variable (should match [a-z_][a-z0-9_]{2,30}$)
W:134,4:setup_resolv: No exception type(s) specified
C:168,8:bind_unmount: Invalid name "b" for type variable (should match [a-z_][a-z0-9_]{2,30}$)
W:178,4:cleanup_resolv: No exception type(s) specified
C:175,8:cleanup_resolv: Invalid name "fd" for type variable (should match [a-z_][a-z0-9_]{2,30}$)
C:184,8:kill_processes: Invalid name "fp" for type variable (should match [a-z_][a-z0-9_]{2,30}$)
W:189,8:kill_processes: No exception type(s) specified
C:283,4:chroot.mychroot: Missing docstring

Signed-off-by: Gui Chen <gui.chen@intel.com>
---
 mic/chroot.py | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/mic/chroot.py b/mic/chroot.py
index a84eb2a..71cb8ab 100644
--- a/mic/chroot.py
+++ b/mic/chroot.py
@@ -78,6 +78,7 @@ def get_bindmounts(chrootdir, bindmounts = None):
     global chroot_bindmounts
 
     def totuple(string):
+        """ convert string contained ':' to a tuple """
         if ':' in string:
             src, dst = string.split(':', 1)
         else:
@@ -127,15 +128,15 @@ def get_bindmounts(chrootdir, bindmounts = None):
 
 def bind_mount(chrootmounts):
     """ perform bind mounting """
-    for b in chrootmounts:
-        msger.verbose("bind_mount: %s -> %s" % (b.src, b.dest))
-        b.mount()
+    for mnt in chrootmounts:
+        msger.verbose("bind_mount: %s -> %s" % (mnt.src, mnt.dest))
+        mnt.mount()
 
 def setup_resolv(chrootdir):
     """ resolve network """
     try:
         shutil.copyfile("/etc/resolv.conf", chrootdir + "/etc/resolv.conf")
-    except:
+    except (OSError, IOError):
         pass
 
 def setup_mtab(chrootdir):
@@ -173,28 +174,28 @@ def setup_chrootenv(chrootdir, bindmounts = None):
 
 def bind_unmount(chrootmounts):
     """ perform bind unmounting """
-    for b in reversed(chrootmounts):
-        msger.verbose("bind_unmount: %s -> %s" % (b.src, b.dest))
-        b.unmount()
+    for mnt in reversed(chrootmounts):
+        msger.verbose("bind_unmount: %s -> %s" % (mnt.src, mnt.dest))
+        mnt.unmount()
 
 def cleanup_resolv(chrootdir):
     """ clear resolv.conf """
     try:
-        fd = open(chrootdir + "/etc/resolv.conf", "w")
-        fd.truncate(0)
-        fd.close()
-    except:
+        fdes = open(chrootdir + "/etc/resolv.conf", "w")
+        fdes.truncate(0)
+        fdes.close()
+    except (OSError, IOError):
         pass
 
 def kill_proc_inchroot(chrootdir):
     """ kill all processes running inside chrootdir """
     import glob
-    for fp in glob.glob("/proc/*/root"):
+    for fpath in glob.glob("/proc/*/root"):
         try:
-            if os.readlink(fp) == chrootdir:
-                pid = int(fp.split("/")[2])
+            if os.readlink(fpath) == chrootdir:
+                pid = int(fpath.split("/")[2])
                 os.kill(pid, 9)
-        except:
+        except (OSError, ValueError):
             pass
 
 def cleanup_mtab(chrootdir):
@@ -289,6 +290,7 @@ def cleanup_after_chroot(targettype, imgmount, tmpdir, tmpmnt):
 def chroot(chrootdir, bindmounts = None, execute = "/bin/bash"):
     """ chroot the chrootdir and execute the command """
     def mychroot():
+        """ pre-execute function """
         os.chroot(chrootdir)
         os.chdir("/")
 
-- 
2.7.4