diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2014-11-09 12:12:37 -0600 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2014-11-09 12:12:37 -0600 |
| commit | 15f1b3eeebc01faeb41cea1b0649a9fac11d624c (patch) | |
| tree | a5ad1e47a3c384b02628ad92db0466ed491d7f0d /src/lib/Bcfg2/Client | |
| parent | be595521fc9fd0bd0fae0115e9b00f504b75db88 (diff) | |
| parent | b4237d77ae2067218e3b0e08fa30d8c7c3e54d2b (diff) | |
| download | bcfg2-15f1b3eeebc01faeb41cea1b0649a9fac11d624c.tar.gz bcfg2-15f1b3eeebc01faeb41cea1b0649a9fac11d624c.tar.bz2 bcfg2-15f1b3eeebc01faeb41cea1b0649a9fac11d624c.zip | |
Merge branch 'yum-fix-syntax' of https://github.com/AlexanderS/bcfg2
Diffstat (limited to 'src/lib/Bcfg2/Client')
| -rw-r--r-- | src/lib/Bcfg2/Client/Tools/YUM.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/lib/Bcfg2/Client/Tools/YUM.py b/src/lib/Bcfg2/Client/Tools/YUM.py index 21fc05b0d..b1caf3332 100644 --- a/src/lib/Bcfg2/Client/Tools/YUM.py +++ b/src/lib/Bcfg2/Client/Tools/YUM.py @@ -11,6 +11,7 @@ import yum.callbacks import yum.Errors import yum.misc import rpmUtils.arch +import rpmUtils.miscutils import Bcfg2.Client.XML import Bcfg2.Client.Tools import Bcfg2.Options @@ -148,12 +149,12 @@ class YUM(Bcfg2.Client.Tools.PkgTool): dest="yum_verify_flags", type=Bcfg2.Options.Types.comma_list, help="YUM verify flags"), Bcfg2.Options.Option( - cf=('YUM', 'disabled_plugins'), default=[], - type=Bcfg2.Options.Types.comma_list, dest="yum_disabled_plugins", + cf=('YUM', 'disabled_plugins'), default=[], + type=Bcfg2.Options.Types.comma_list, dest="yum_disabled_plugins", help="YUM disabled plugins"), Bcfg2.Options.Option( - cf=('YUM', 'enabled_plugins'), default=[], - type=Bcfg2.Options.Types.comma_list, dest="yum_enabled_plugins", + cf=('YUM', 'enabled_plugins'), default=[], + type=Bcfg2.Options.Types.comma_list, dest="yum_enabled_plugins", help="YUM enabled plugins")] pkgtype = 'yum' @@ -660,7 +661,7 @@ class YUM(Bcfg2.Client.Tools.PkgTool): nevra.get('release', 'any')) entry.set('current_version', "%s:%s-%s" % current_evr) entry.set('version', "%s:%s-%s" % wanted_evr) - if yum.compareEVR(current_evr, wanted_evr) == 1: + if rpmUtils.miscutils.compareEVR(current_evr, wanted_evr) == 1: entry.set("package_fail_action", "downgrade") else: entry.set("package_fail_action", "update") |