diff options
| author | Nathan Olla <ollan@deshawresearch.com> | 2014-07-16 15:21:39 -0400 |
|---|---|---|
| committer | Nathan Olla <ollan@deshawresearch.com> | 2014-07-16 15:21:39 -0400 |
| commit | b40dc8df20d8b1566da45ccea0620c60de476222 (patch) | |
| tree | 961eb09620e14f92b75a9e9f19cd56cadf262ffc | |
| parent | c81ee4a99dfbd65b6ccde5a2d3fee9dd3caf5fc1 (diff) | |
| download | bcfg2-b40dc8df20d8b1566da45ccea0620c60de476222.tar.gz bcfg2-b40dc8df20d8b1566da45ccea0620c60de476222.tar.bz2 bcfg2-b40dc8df20d8b1566da45ccea0620c60de476222.zip | |
Check for origpkgtool attribute to prevent things that subclass SYSV from breaking
| -rw-r--r-- | src/lib/Bcfg2/Client/Tools/SYSV.py | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/lib/Bcfg2/Client/Tools/SYSV.py b/src/lib/Bcfg2/Client/Tools/SYSV.py index 48d67c4f1..712dcce32 100644 --- a/src/lib/Bcfg2/Client/Tools/SYSV.py +++ b/src/lib/Bcfg2/Client/Tools/SYSV.py @@ -67,12 +67,14 @@ class SYSV(Bcfg2.Client.Tools.PkgTool): def _get_package_command(self, packages): """Override the default _get_package_command, replacing the attribute 'url' if '_sysv_pkg_path' if necessary in the returned command - string""" - if len(packages) == 1 and '_sysv_pkg_path' in packages[0].keys(): - self.pkgtool = (self.pkgtool[0], ('%s %s', - ['_sysv_pkg_path', 'name'])) - else: - self.pkgtool = self.origpkgtool + string + """ + if hasattr(self, 'origpkgtool'): + if len(packages) == 1 and '_sysv_pkg_path' in packages[0].keys(): + self.pkgtool = (self.pkgtool[0], ('%s %s', + ['_sysv_pkg_path', 'name'])) + else: + self.pkgtool = self.origpkgtool pkgcmd = super(SYSV, self)._get_package_command(packages) self.logger.debug("Calling install command: %s" % pkgcmd) |