diff options
| author | Luke Kanies <luke@madstop.com> | 2008-02-28 16:30:53 -0600 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-02-28 16:30:53 -0600 |
| commit | b79d15ea893f123f4968879b84aea36eb118712a (patch) | |
| tree | 024002214690f8aa55623dc7df6131aeabf9e617 /lib | |
| parent | 9d6e926d8196294afe6b5a03c20a9035056575f1 (diff) | |
| parent | f0975df7ae2d57f8ac38ab5466b2a378ccabd855 (diff) | |
| download | puppet-b79d15ea893f123f4968879b84aea36eb118712a.tar.gz puppet-b79d15ea893f123f4968879b84aea36eb118712a.tar.xz puppet-b79d15ea893f123f4968879b84aea36eb118712a.zip | |
Merge commit 'lutter/0.24.x' into 0.24.x
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/provider/package/yumhelper.py | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/lib/puppet/provider/package/yumhelper.py b/lib/puppet/provider/package/yumhelper.py index 1142401b9..962b96ce4 100644 --- a/lib/puppet/provider/package/yumhelper.py +++ b/lib/puppet/provider/package/yumhelper.py @@ -13,8 +13,7 @@ OVERRIDE_OPTS = { 'logfile': '/dev/null' } -def pkg_lists(): - my = yum.YumBase() +def pkg_lists(my): my.doConfigSetup() for k in OVERRIDE_OPTS.keys(): @@ -28,10 +27,13 @@ def pkg_lists(): return my.doPackageLists('updates') try: - ypl = pkg_lists() + try: + my = yum.YumBase() + ypl = pkg_lists(my) + for pkg in ypl.updates: + print "_pkg %s %s %s %s %s" % (pkg.name, pkg.epoch, pkg.version, pkg.release, pkg.arch) + finally: + my.closeRpmDB() except IOError, e: print "_err IOError %d %s" % (e.errno, e) sys.exit(1) - -for pkg in ypl.updates: - print "_pkg %s %s %s %s %s" % (pkg.name, pkg.epoch, pkg.version, pkg.release, pkg.arch) |