summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Turnbull <james@lovedthanlost.net>2008-11-01 10:56:52 +1100
committerJames Turnbull <james@lovedthanlost.net>2008-11-01 10:56:52 +1100
commit0a3d34dbe7b5175f4822b6f1bfaa6f0ba05e9bd2 (patch)
tree25767c3221bfef92806ca16223ed9daaa61b0c28
parent7b70e85d717fbd1ae52e94658df8b407b043f8b8 (diff)
downloadpuppet-0a3d34dbe7b5175f4822b6f1bfaa6f0ba05e9bd2.tar.gz
puppet-0a3d34dbe7b5175f4822b6f1bfaa6f0ba05e9bd2.tar.xz
puppet-0a3d34dbe7b5175f4822b6f1bfaa6f0ba05e9bd2.zip
Fixes #1714 - yumhelper handling with yum 2.2.x is broken
-rw-r--r--lib/puppet/provider/package/yumhelper.py9
1 files changed, 9 insertions, 0 deletions
diff --git a/lib/puppet/provider/package/yumhelper.py b/lib/puppet/provider/package/yumhelper.py
index 8eab0d081..6263d3473 100644
--- a/lib/puppet/provider/package/yumhelper.py
+++ b/lib/puppet/provider/package/yumhelper.py
@@ -39,6 +39,15 @@ def pkg_lists(my):
my.doTsSetup()
my.doRpmDBSetup()
+
+ # Yum 2.2/2.3 python libraries require a couple of extra function calls to setup package sacks.
+ # They also don't have a __version__ attribute
+ try:
+ yumver = yum.__version__
+ except AttributeError:
+ my.doRepoSetup()
+ my.doSackSetup()
+
return my.doPackageLists('updates')
def shell_out():