diff options
| author | Narayan Desai <desai@mcs.anl.gov> | 2005-12-13 21:46:22 +0000 |
|---|---|---|
| committer | Narayan Desai <desai@mcs.anl.gov> | 2005-12-13 21:46:22 +0000 |
| commit | 1003fe365057641df5879ad578cf3cab1f68a8c7 (patch) | |
| tree | e32f0a0a3c58655237eba1c7e96d93e3f413cae5 | |
| parent | 8d6846fa73ceadf1011237ec7048a7eed39c0805 (diff) | |
| download | bcfg2-1003fe365057641df5879ad578cf3cab1f68a8c7.tar.gz bcfg2-1003fe365057641df5879ad578cf3cab1f68a8c7.tar.bz2 bcfg2-1003fe365057641df5879ad578cf3cab1f68a8c7.zip | |
fix two minor problems
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@1626 ce84e21b-d406-0410-9b95-82705330c041
| -rw-r--r-- | src/lib/Client/Redhat.py | 4 | ||||
| -rw-r--r-- | src/lib/Client/Solaris.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/Client/Redhat.py b/src/lib/Client/Redhat.py index 6c9d0d7c9..d68288b79 100644 --- a/src/lib/Client/Redhat.py +++ b/src/lib/Client/Redhat.py @@ -6,7 +6,7 @@ __revision__ = '$Revision$' from os import popen, system -from Bcfg2.Client.Toolset import Toolset, saferun +from Bcfg2.Client.Toolset import Toolset class ToolsetImpl(Toolset): '''This class implelements support for rpm packages and standard chkconfig services''' @@ -95,7 +95,7 @@ class ToolsetImpl(Toolset): self.CondPrint('debug', "Package %s: not installed" % (entry.get('name'))) return False - (vstat, output) = saferun("rpm --verify -q %s-%s" % (entry.get('name'), entry.get('version'))) + (vstat, output) = self.saferun("rpm --verify -q %s-%s" % (entry.get('name'), entry.get('version'))) if vstat != 0: if [name for name in output if name.split()[-1] not in modlist]: self.CondPrint('debug', diff --git a/src/lib/Client/Solaris.py b/src/lib/Client/Solaris.py index 8ab506aa9..6001d4f62 100644 --- a/src/lib/Client/Solaris.py +++ b/src/lib/Client/Solaris.py @@ -7,7 +7,7 @@ from os import popen, stat, system, unlink from re import compile as regcompile from tempfile import mktemp -from Bcfg2.Client.Toolset import Toolset, saferun +from Bcfg2.Client.Toolset import Toolset noask = ''' mail= @@ -143,7 +143,7 @@ class ToolsetImpl(Toolset): if entry.attrib.get('verify', 'true') == 'true': if self.setup['quick'] or entry.get('type') == 'encap': return True - (vstat, odata) = saferun("/usr/sbin/pkgchk -n %s" % (entry.get('name'))) + (vstat, odata) = self.saferun("/usr/sbin/pkgchk -n %s" % (entry.get('name'))) if vstat == 0: return True else: |