From f26e87ab42fdb8b560862288e9278007cdf67cc8 Mon Sep 17 00:00:00 2001
From: Narayan Desai <desai@mcs.anl.gov>
Date: Thu, 1 Feb 2007 20:48:44 +0000
Subject: fix Yup/RPM conflict

git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2759 ce84e21b-d406-0410-9b95-82705330c041
---
 src/lib/Client/Tools/Yum.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src')

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'''
-- 
cgit v1.2.3-1-g7c22