summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Roberts <Markus@reality.com>2010-10-05 16:07:35 -0700
committerMarkus Roberts <Markus@reality.com>2010-10-05 16:25:37 -0700
commit55417bc454132bc8c48ff98d5092baa85f94d6ed (patch)
tree1e6b6c8c74ee8fcfa8196e56f5a2a58bce5f20ef
parenta6e2beaba1565a87bbd5266154883b72a700b3f3 (diff)
downloadpuppet-55417bc454132bc8c48ff98d5092baa85f94d6ed.tar.gz
puppet-55417bc454132bc8c48ff98d5092baa85f94d6ed.tar.xz
puppet-55417bc454132bc8c48ff98d5092baa85f94d6ed.zip
Reversion of 021d534482dd8edb863cb77d668ac3525362a0a6
This fix for #3707 was incorrect & just moved the problem (see #4929).
-rwxr-xr-xlib/puppet/provider/package/rpm.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/puppet/provider/package/rpm.rb b/lib/puppet/provider/package/rpm.rb
index ec6121743..72dc260a4 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