diff options
| -rw-r--r-- | src/lib/Bcfg2/Client/Tools/YUMng.py | 4 | ||||
| -rwxr-xr-x | src/sbin/bcfg2 | 14 |
2 files changed, 10 insertions, 8 deletions
diff --git a/src/lib/Bcfg2/Client/Tools/YUMng.py b/src/lib/Bcfg2/Client/Tools/YUMng.py index aba556bbd..d58e08f57 100644 --- a/src/lib/Bcfg2/Client/Tools/YUMng.py +++ b/src/lib/Bcfg2/Client/Tools/YUMng.py @@ -211,8 +211,8 @@ class YUMng(Bcfg2.Client.Tools.PkgTool): self.pkg_checks = self.setup["yumng_pkg_checks"] self.pkg_verify = self.setup["yumng_pkg_verify"] self.doInstall = self.setup["yumng_installed_action"] == "install" - self.doUpgrade = self.setup["yumng_version_action"] == "upgrade" - self.doReinst = self.setup["yumng_verify_action"] == "reinstall" + self.doUpgrade = self.setup["yumng_version_fail_action"] == "upgrade" + self.doReinst = self.setup["yumng_verify_fail_action"] == "reinstall" self.verifyFlags = self.setup["yumng_verify_flags"] self.installOnlyPkgs = self.yb.conf.installonlypkgs diff --git a/src/sbin/bcfg2 b/src/sbin/bcfg2 index 3b5877c09..3cfdf38f6 100755 --- a/src/sbin/bcfg2 +++ b/src/sbin/bcfg2 @@ -95,12 +95,14 @@ class Client: self.logger.info("The following drivers are available:") self.logger.info(Bcfg2.Client.Tools.drivers) raise SystemExit(0) - if self.setup['remove'] and 'services' in self.setup['remove']: - self.logger.error("Service removal is nonsensical; removed services will only be disabled") - if self.setup['remove'] not in [None, 'all', - 'Services', 'Packages', - 'services', 'packages']: - self.logger.error("Got unknown argument %s for -r" % (self.setup['remove'])) + if self.setup['remove'] and 'services' in self.setup['remove'].lower(): + self.logger.error("Service removal is nonsensical; " + "removed services will only be disabled") + if (self.setup['remove'] and + self.setup['remove'].lower() not in ['all', 'services', + 'packages']): + self.logger.error("Got unknown argument %s for -r" % + self.setup['remove']) if self.setup["file"] and self.setup["cache"]: print("cannot use -f and -c together") raise SystemExit(1) |