diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2011-12-30 09:50:05 -0500 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2011-12-30 09:50:05 -0500 |
| commit | 5fc3effb174ff6e9fbfd05346134ac8861477884 (patch) | |
| tree | 2772e81b9447d2d85247f2aeb5491fe32b48644b /src/lib/Server/Plugins/Packages/Yum.py | |
| parent | 6a9e492eaaca81609e7dd149a660bb24e119572c (diff) | |
| download | bcfg2-5fc3effb174ff6e9fbfd05346134ac8861477884.tar.gz bcfg2-5fc3effb174ff6e9fbfd05346134ac8861477884.tar.bz2 bcfg2-5fc3effb174ff6e9fbfd05346134ac8861477884.zip | |
added SimpleConfig plugin for easy config files; made Packages and Rules use SimpleConfig; made regex in rules off by default, but configurable in rules.conf
Diffstat (limited to 'src/lib/Server/Plugins/Packages/Yum.py')
| -rw-r--r-- | src/lib/Server/Plugins/Packages/Yum.py | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/lib/Server/Plugins/Packages/Yum.py b/src/lib/Server/Plugins/Packages/Yum.py index 369b7a7d2..f3cb5a532 100644 --- a/src/lib/Server/Plugins/Packages/Yum.py +++ b/src/lib/Server/Plugins/Packages/Yum.py @@ -113,11 +113,8 @@ class YumCollection(Collection): "%s-yum.conf" % self.cachekey) self.write_config() - try: - self.helper = self.config.get("yum", "helper") - except ConfigParser.NoOptionError: - self.helper = "/usr/sbin/bcfg2-yum-helper" - + self.helper = self.config.get("yum", "helper", + default="/usr/sbin/bcfg2-yum-helper") if has_pulp: _setup_pulp(self.config) @@ -192,11 +189,8 @@ class YumCollection(Collection): for key in needkeys: # figure out the path of the key on the client - try: - keydir = self.config.get("global", "gpg_keypath") - except (ConfigParser.NoOptionError, - ConfigParser.NoSectionError): - keydir = "/etc/pki/rpm-gpg" + keydir = self.config.get("global", "gpg_keypath", + default="/etc/pki/rpm-gpg") remotekey = os.path.join(keydir, os.path.basename(key)) localkey = os.path.join(self.keypath, os.path.basename(key)) kdata = open(localkey).read() |