summaryrefslogtreecommitdiffstats
path: root/lib/puppet
diff options
context:
space:
mode:
authorMatt Robinson <matt@puppetlabs.com>2010-11-15 14:24:15 -0800
committerMarkus Roberts <Markus@reality.com>2010-11-16 12:22:04 -0800
commit74b6c09e3b074e0ffc8679dcf31b5fa900020e39 (patch)
tree1660838f1bc3a05dab4ee94cb320526648ce6bf3 /lib/puppet
parent866205624873d0a6ab17c03061e89d74a3a77019 (diff)
downloadpuppet-74b6c09e3b074e0ffc8679dcf31b5fa900020e39.tar.gz
puppet-74b6c09e3b074e0ffc8679dcf31b5fa900020e39.tar.xz
puppet-74b6c09e3b074e0ffc8679dcf31b5fa900020e39.zip
(#4726) Fix RRD legacy support
There was a section of code that didn't take the legacy RRD library into account. This caused a unit test failure, but only if you have the RRD legacy library installed, which I did. Paired-with: Jesse Wolfe <jesse@puppetlabs.com>
Diffstat (limited to 'lib/puppet')
-rw-r--r--lib/puppet/util/metric.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/util/metric.rb b/lib/puppet/util/metric.rb
index 90a244836..8f55e7b44 100644
--- a/lib/puppet/util/metric.rb
+++ b/lib/puppet/util/metric.rb
@@ -64,7 +64,7 @@ class Puppet::Util::Metric
end
def graph(range = nil)
- unless Puppet.features.rrd?
+ unless Puppet.features.rrd? || Puppet.features.rrd_legacy?
Puppet.warning "RRD library is missing; cannot graph metrics"
return
end