summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2012-06-04 11:49:19 -0400
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2012-06-04 11:49:19 -0400
commitdbb3146b3270363f76e0f6ba1ad9751ff359091c (patch)
tree125e7aeb36f21456660fa291e7043b95cb58fefb
parent9a6cae4e5ed2c8615c17d462d5aa5b7828cdb23b (diff)
downloadbcfg2-dbb3146b3270363f76e0f6ba1ad9751ff359091c.tar.gz
bcfg2-dbb3146b3270363f76e0f6ba1ad9751ff359091c.tar.bz2
bcfg2-dbb3146b3270363f76e0f6ba1ad9751ff359091c.zip
fixed docs, code that referenced old yum section of packages.conf
-rw-r--r--doc/server/plugins/generators/packages.txt6
-rw-r--r--src/lib/Bcfg2/Server/Plugins/Packages/Yum.py2
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/server/plugins/generators/packages.txt b/doc/server/plugins/generators/packages.txt
index e8988a891..b29752270 100644
--- a/doc/server/plugins/generators/packages.txt
+++ b/doc/server/plugins/generators/packages.txt
@@ -448,10 +448,10 @@ bcfg2-server process uses an external short-lived helper,
library support. By default, Bcfg2 looks for this helper in
``$PATH``, or, failing that, at ``/usr/sbin/bcfg2-yum-helper``. If
you have installed the helper elsewhere, you will need to configure
-that location with the ``helper`` option in the ``[yum]`` section,
-e.g.::
+that location with the ``helper`` option in the ``[packages:yum]``
+section, e.g.::
- [yum]
+ [packages:yum]
use_yum_libraries = 1
helper = /usr/local/sbin/bcfg2-yum-helper
diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py b/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py
index effec1c0e..ddc1aa0f9 100644
--- a/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py
+++ b/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py
@@ -110,7 +110,7 @@ class YumCollection(Collection):
@property
def helper(self):
try:
- return self.config.get("yum", "helper")
+ return self.setup.cfp.get("packages:yum", "helper")
except:
pass