summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/lib/Client/Tools/YUM24.py2
-rw-r--r--src/lib/Client/Tools/YUMng.py2
2 files changed, 1 insertions, 3 deletions
diff --git a/src/lib/Client/Tools/YUM24.py b/src/lib/Client/Tools/YUM24.py
index 04d9f5c07..5387fdd6a 100644
--- a/src/lib/Client/Tools/YUM24.py
+++ b/src/lib/Client/Tools/YUM24.py
@@ -76,8 +76,6 @@ class YUM24(Bcfg2.Client.Tools.RPMng.RPMng):
__new_gpg_ireq__ = {'Package': ['name'],
'Instance': ['version', 'release']}
- conflicts = ['YUMng', 'RPMng']
-
def __init__(self, logger, setup, config):
Bcfg2.Client.Tools.RPMng.RPMng.__init__(self, logger, setup, config)
self.__important__ = self.__important__ + \
diff --git a/src/lib/Client/Tools/YUMng.py b/src/lib/Client/Tools/YUMng.py
index c9e7aa15e..7299ab4c0 100644
--- a/src/lib/Client/Tools/YUMng.py
+++ b/src/lib/Client/Tools/YUMng.py
@@ -141,7 +141,7 @@ class YUMng(Bcfg2.Client.Tools.PkgTool):
'Path': ['type']}
__ireq__ = {'Package': ['name']}
- conflicts = ['RPMng']
+ conflicts = ['YUMng', 'RPMng']
def __init__(self, logger, setup, config):
self.yb = yum.YumBase()