[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 2.6.2rc1-118-g539d0bf
Markus Roberts
Markus at reality.com
Sun Oct 17 19:06:58 UTC 2010
The following commit has been merged in the upstream branch:
commit 55417bc454132bc8c48ff98d5092baa85f94d6ed
Author: Markus Roberts <Markus at reality.com>
Date: Tue Oct 5 16:07:35 2010 -0700
Reversion of 021d534482dd8edb863cb77d668ac3525362a0a6
This fix for #3707 was incorrect & just moved the problem (see #4929).
diff --git a/lib/puppet/provider/package/rpm.rb b/lib/puppet/provider/package/rpm.rb
index ec61217..72dc260 100755
--- a/lib/puppet/provider/package/rpm.rb
+++ b/lib/puppet/provider/package/rpm.rb
@@ -60,8 +60,7 @@ Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Pr
begin
output = rpm(*cmd)
rescue Puppet::ExecutionFailure
- # rpm exits 1 if the package is not found.
- return {:ensure => :purged, :status => 'missing', :name => @resource[:name], :error => 'ok'}
+ return nil
end
# FIXME: We could actually be getting back multiple packages
--
Puppet packaging for Debian
More information about the Pkg-puppet-devel
mailing list