summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNarayan Desai <desai@mcs.anl.gov>2006-05-02 15:36:56 +0000
committerNarayan Desai <desai@mcs.anl.gov>2006-05-02 15:36:56 +0000
commit476a5c27cd9a0548facb8f51c78df571f183535e (patch)
tree8840c1114ee1c999df00e5949e4659b5a9a2bd11
parente6ce3facc910176824b629314d5b5b405d57b9b1 (diff)
downloadbcfg2-476a5c27cd9a0548facb8f51c78df571f183535e.tar.gz
bcfg2-476a5c27cd9a0548facb8f51c78df571f183535e.tar.bz2
bcfg2-476a5c27cd9a0548facb8f51c78df571f183535e.zip
* 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
-rw-r--r--src/lib/Client/Redhat.py2
-rw-r--r--src/lib/Client/Toolset.py6
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