diff options
| author | Narayan Desai <desai@mcs.anl.gov> | 2007-02-02 15:34:37 +0000 |
|---|---|---|
| committer | Narayan Desai <desai@mcs.anl.gov> | 2007-02-02 15:34:37 +0000 |
| commit | af40c63767af1168e8277fa9b68a35ca9c89bfee (patch) | |
| tree | 59adcb45835492b0fee79e6a82a2b687a0bc28d3 | |
| parent | 4654401ee1cff559c2f4af7344870c487de13276 (diff) | |
| download | bcfg2-af40c63767af1168e8277fa9b68a35ca9c89bfee.tar.gz bcfg2-af40c63767af1168e8277fa9b68a35ca9c89bfee.tar.bz2 bcfg2-af40c63767af1168e8277fa9b68a35ca9c89bfee.zip | |
Client Tool driver updates (Yum and Blastwave)
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2768 ce84e21b-d406-0410-9b95-82705330c041
| -rw-r--r-- | src/lib/Client/Tools/Blast.py | 3 | ||||
| -rw-r--r-- | src/lib/Client/Tools/Yum.py | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/Client/Tools/Blast.py b/src/lib/Client/Tools/Blast.py index 459fb2ff8..f5a1f275a 100644 --- a/src/lib/Client/Tools/Blast.py +++ b/src/lib/Client/Tools/Blast.py @@ -7,10 +7,11 @@ import Bcfg2.Client.Tools.SYSV, tempfile class Blast(Bcfg2.Client.Tools.SYSV.SYSV): '''Support for Blastwave packages''' pkgtype = 'blast' - pkgtool = ("/opt/csw/bin/pkg-get install %s", ("%s", ["name"])) + pkgtool = ("/opt/csw/bin/pkg-get install %s", ("%s", ["bname"])) __name__ = 'Blast' __execs__ = ['/opt/csw/bin/pkg-get'] __handles__ = [('Package', 'blast')] + __ireq__ = {'Package': ['name', 'version', 'bname']} def __init__(self, logger, setup, config, states): # dont use the sysv constructor diff --git a/src/lib/Client/Tools/Yum.py b/src/lib/Client/Tools/Yum.py index 1760b3349..462ea09fd 100644 --- a/src/lib/Client/Tools/Yum.py +++ b/src/lib/Client/Tools/Yum.py @@ -25,7 +25,7 @@ class Yum(Bcfg2.Client.Tools.RPM.RPM): pkgtool = ("/usr/bin/yum -d0 install %s", ("%s-%s", ["name", "version"])) __name__ = 'Yum' __execs__ = ['/usr/bin/yum', '/var/lib/rpm'] - __handles__ = [('Package', 'yum')] + __handles__ = [('Package', 'yum'), ('Package', 'rpm')] __req__ = {'Package': ['name', 'version']} conflicts = ['RPM'] |