diff options
| author | Jesse Wolfe <jes5199@gmail.com> | 2010-10-12 13:36:54 -0700 |
|---|---|---|
| committer | Jesse Wolfe <jes5199@gmail.com> | 2010-10-12 13:36:54 -0700 |
| commit | 2d13fdaac56bd5cd57444cc4447081649e18f487 (patch) | |
| tree | 9dfe175ba879c96082996798fdedcab7988ed7c1 /lib/puppet | |
| parent | e6c829617ccc120e04f945e8714f792ce29c284d (diff) | |
| parent | 295c3be532b01a3ab58411b32b489730922d1c75 (diff) | |
| download | puppet-2d13fdaac56bd5cd57444cc4447081649e18f487.tar.gz puppet-2d13fdaac56bd5cd57444cc4447081649e18f487.tar.xz puppet-2d13fdaac56bd5cd57444cc4447081649e18f487.zip | |
Merge commit '2.6.2' into next
Diffstat (limited to 'lib/puppet')
| -rwxr-xr-x | lib/puppet/provider/package/rpm.rb | 3 | ||||
| -rw-r--r-- | lib/puppet/util/metric.rb | 2 |
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 |