diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2011-06-09 10:41:58 -0500 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2011-06-14 12:36:46 -0500 |
| commit | 733f3e51f2e1986005b37caeedca8edf4c464471 (patch) | |
| tree | 8e682c5f95dcd0bfa6c1004030493c8e3d7f89c9 | |
| parent | 0b074d1d8dff851081a892e6a6755c36f51c189f (diff) | |
| download | bcfg2-733f3e51f2e1986005b37caeedca8edf4c464471.tar.gz bcfg2-733f3e51f2e1986005b37caeedca8edf4c464471.tar.bz2 bcfg2-733f3e51f2e1986005b37caeedca8edf4c464471.zip | |
YUM: Make YUMng the preferred client tool on RPM systems
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
| -rw-r--r-- | src/lib/Client/Tools/YUM24.py | 2 | ||||
| -rw-r--r-- | src/lib/Client/Tools/YUMng.py | 2 |
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() |