diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-01-13 08:09:22 -0500 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-01-13 08:09:22 -0500 |
| commit | 238f6446d09ca8e3b7a082876920922ee1eda4d2 (patch) | |
| tree | 7a59ba455180c9950631334180af64ba68eeadee /src/lib/Server/Plugins/Packages/Yum.py | |
| parent | 8c9b825595174455242b3b2f6ca96ddcbdcfff2e (diff) | |
| parent | b6654dd316f9cd4f6a6673a89cdd48cc1b38b82a (diff) | |
| download | bcfg2-238f6446d09ca8e3b7a082876920922ee1eda4d2.tar.gz bcfg2-238f6446d09ca8e3b7a082876920922ee1eda4d2.tar.bz2 bcfg2-238f6446d09ca8e3b7a082876920922ee1eda4d2.zip | |
merged branch rules_regex
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() |