summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNarayan Desai <desai@mcs.anl.gov>2007-02-01 20:48:44 +0000
committerNarayan Desai <desai@mcs.anl.gov>2007-02-01 20:48:44 +0000
commitf26e87ab42fdb8b560862288e9278007cdf67cc8 (patch)
treebac49fcbb72fd78c2760c34ba6329f0aff6398be /src
parentb4117035bc567ec82c12d1996cd0417d1540f92e (diff)
downloadbcfg2-f26e87ab42fdb8b560862288e9278007cdf67cc8.tar.gz
bcfg2-f26e87ab42fdb8b560862288e9278007cdf67cc8.tar.bz2
bcfg2-f26e87ab42fdb8b560862288e9278007cdf67cc8.zip
fix Yup/RPM conflict
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2759 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src')
-rw-r--r--src/lib/Client/Tools/Yum.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/lib/Client/Tools/Yum.py b/src/lib/Client/Tools/Yum.py
index dc4cd017b..1760b3349 100644
--- a/src/lib/Client/Tools/Yum.py
+++ b/src/lib/Client/Tools/Yum.py
@@ -4,8 +4,6 @@ __revision__ = '$Revision$'
import Bcfg2.Client.Tools.RPM, ConfigParser, sys
-conflicts = ['RPM']
-
YAD = True
CP = ConfigParser.ConfigParser()
try:
@@ -29,6 +27,7 @@ class Yum(Bcfg2.Client.Tools.RPM.RPM):
__execs__ = ['/usr/bin/yum', '/var/lib/rpm']
__handles__ = [('Package', 'yum')]
__req__ = {'Package': ['name', 'version']}
+ conflicts = ['RPM']
def RemovePackages(self, packages):
'''Remove specified entries'''