* Pylint cleanups

 * Add more debug level logging for install runs


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

2 files changed, 6 insertions, 2 deletions

diff --git a/src/lib/Client/Redhat.py b/src/lib/Client/Redhat.py
index c1c2f69c5..93cff62fd 100644
--- a/src/lib/Client/Redhat.py
+++ b/src/lib/Client/Redhat.py
@@ -85,6 +85,8 @@ class ToolsetImpl(Toolset):
         if self.installed.has_key(entry.get('name')):
             if entry.get('version') == self.installed[entry.get('name')]:
                 if (self.setup['quick'] or (entry.get('verify', 'true') == 'false')):
+                    if entry.get('verify', 'true') == 'false':
+                        self.logger.debug("Skipping checksum verification for package %s" % (entry.get('name')))
                     return True
             else:
                 self.logger.debug("Package %s: wrong version installed. want %s have %s" %
diff --git a/src/lib/Client/Toolset.py b/src/lib/Client/Toolset.py
index a081f7de0..fd8e01604 100644
--- a/src/lib/Client/Toolset.py
+++ b/src/lib/Client/Toolset.py
@@ -229,6 +229,8 @@ class Toolset(object):
             sloc = os.readlink(entry.get('name'))
             if sloc == entry.get('to'):
                 return True
+            self.logger.debug("Symlink %s points to %s, should be %s" % (entry.get('name'),
+                                                                         sloc, entry.get('to')))
             return False
         except OSError:
             return False
@@ -437,7 +439,7 @@ class Toolset(object):
                 print err
             return False
 
-    def VerifyPackage(self, entry, modlist):
+    def VerifyPackage(self, _, dummy):
         '''Dummy package verification method. Cannot succeed'''
         return False
 
@@ -472,7 +474,7 @@ class Toolset(object):
         self.logger.info("Entry %s has unknown file type" % entry.get('name'))
         return False
 
-    def VerifyPostInstall(self, entry):
+    def VerifyPostInstall(self, _):
         '''Postinstall verification method'''
         return True