pylint fixes

(Logical change 1.118)


git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@520 ce84e21b-d406-0410-9b95-82705330c041

1 files changed, 32 insertions, 31 deletions

diff --git a/src/lib/Client/Redhat.py b/src/lib/Client/Redhat.py
index c3c0da4ac..c6d55bc48 100644
--- a/src/lib/Client/Redhat.py
+++ b/src/lib/Client/Redhat.py
@@ -1,18 +1,14 @@
 # This is the bcfg2 support for redhat
 # $Id: $
 
-__revision__ = '$Revision$'
 '''This is redhat client support'''
+__revision__ = '$Revision$'
 
 from os import popen, system
 from popen2 import Popen4
 
 from Bcfg2.Client.Toolset import Toolset
 
-def Detect():
-    # until the code works
-    return False
-
 class Redhat(Toolset):
     '''This class implelements support for rpm packages and standard chkconfig services'''
     rpmcmd = "rpm --oldpackage --replacepkgs --quiet -U %s"
@@ -22,44 +18,47 @@ class Redhat(Toolset):
         self.pkgtodo = []
 
     def VerifyService(self, entry):
+        '''Verify Service status for entry'''
         srvdata = popen("/sbin/chkconfig --list %s"%entry.attrib['name']).readlines()[0].split()
         if entry.attrib['type'] == 'xinetd':
             if entry.attrib['status'] == srvdata[1]:
                 return True
             else:
                 return False
+
+        # chkconfig/init.d service
+        if entry.attrib['status'] == 'off':
+            for level in srvdata[1:]:
+                if level.split(':')[1] != 'off':
+                    return False
+            return True
         else:
-            # chkconfig/init.d service
-            if entry.attrib['status'] == 'off':
-                for level in srvdata[1:]:
-                    if level.split(':')[1] != 'off':
+            # services should be on for 2345
+            for level in srvdata[1:]:
+                [num, status] = level.split(':')
+                if num in '2345':
+                    if status == 'off':
                         return False
-                return True
-            else:
-                # services should be on for 2345
-                for level in srvdata[1:]:
-                    [num, status] = level.split(':')
-                    if num in '2345':
-                        if status == 'off':
-                            return False
-                    else:
-                        if status == 'on':
-                            return False
-                return True
+                else:
+                    if status == 'on':
+                        return False
+            return True
     
     def InstallService(self, entry):
+        '''Install Service entry'''
         system("/sbin/chkconfig --add %s"%(entry.attrib['name']))
         if entry.attrib['status'] == 'off':
-            rc = system("/sbin/chkconfig --level 0123456 %s %s" % (entry.attrib['name'], entry.attrib['status']))
+            cmdrc = system("/sbin/chkconfig --level 0123456 %s %s" % (entry.attrib['name'], entry.attrib['status']))
         else:
-            rc = system("/sbin/chkconfig %s %s" %
+            cmdrc = system("/sbin/chkconfig %s %s" %
                         (entry.attrib['name'], entry.attrib['status']))
-        if rc == 0:
+        if cmdrc == 0:
             return True
         else:
             return False
 
     def VerifyPackage(self, entry, modlist = []):
+        '''Verify Package status for entry'''
         instp = Popen4("rpm -qi %s-%s" % (entry.attrib['name'], entry.attrib['version']))
         istat = instp.wait()/256
         if istat == 0:
@@ -73,22 +72,24 @@ class Redhat(Toolset):
                 while vstat == -1:
                     odata += verp.fromchild.read()
                     vstat = verp.poll() >> 8
-                output = [x for x in odata.split("\n") if x]
+                output = [line for line in odata.split("\n") if line]
                 if vstat == 0:
                     return True
                 else:
-                    if len([x for x in output if x.split()[-1] not in modlist]) == 0:
+                    if len([name for name in output if name.split()[-1] not in modlist]):
                         return True
         return False
 
     def InstallPackage(self, entry):
+        '''Install Package entry'''
         self.pkgtodo.append(entry)
         return False
 
     def Install(self):
+        '''Fix detected misconfigurations'''
         # try single install
-        rc = system(self.rpmcmd % (" ".join([x.attrib['url'] for x in self.pkgtodo])))
-        if rc == 0:
+        cmdrc = system(self.rpmcmd % (" ".join([pkg.get('url') for pkg in self.pkgtodo])))
+        if cmdrc == 0:
             # set state == True for all just-installed packages
             for pkg in self.pkgtodo:
                 self.states[pkg] = True
@@ -99,12 +100,12 @@ class Redhat(Toolset):
             while oldlen > len(self.pkgtodo):
                 oldlen = len(self.pkgtodo)
                 for entry in self.pkgtodo:
-                    rc = system(self.rpmcmd%(entry.attrib['url']))
-                    if rc == 0:
+                    cmdrc = system(self.rpmcmd % (entry.get('url')))
+                    if cmdrc == 0:
                         self.states[entry] = True
                         self.pkgtodo.remove(entry)
                     else:
                         if self.setup['verbose']:
-                            print "package %s-%s failed to install" % (entry.attrib['name'], entry.attrib['version'])
+                            print "package %s-%s failed to install" % (entry.get('name'), entry.get('version'))