summaryrefslogtreecommitdiffstats
path: root/lib/puppet
diff options
context:
space:
mode:
Diffstat (limited to 'lib/puppet')
-rwxr-xr-xlib/puppet/provider/package/rpm.rb3
-rw-r--r--lib/puppet/util/metric.rb2
2 files changed, 2 insertions, 3 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
diff --git a/lib/puppet/util/metric.rb b/lib/puppet/util/metric.rb
index 00898472f..90a244836 100644
--- a/lib/puppet/util/metric.rb
+++ b/lib/puppet/util/metric.rb
@@ -59,7 +59,7 @@ class Puppet::Util::Metric
if Puppet.features.rrd_legacy? && ! Puppet.features.rrd?
puts @rrd.info
else
- puts RRD.info self.path
+ puts RRD.info(self.path)
end
end