From dbb3146b3270363f76e0f6ba1ad9751ff359091c Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Mon, 4 Jun 2012 11:49:19 -0400 Subject: fixed docs, code that referenced old yum section of packages.conf --- doc/server/plugins/generators/packages.txt | 6 +++--- src/lib/Bcfg2/Server/Plugins/Packages/Yum.py | 2 +- 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 -- cgit v1.2.3-1-g7c22