[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, master, updated. 2.6.3-345-g919f443

[Markus Roberts]

The following commit has been merged in the master branch:
commit 74b6c09e3b074e0ffc8679dcf31b5fa900020e39
Author: Matt Robinson <matt at puppetlabs.com>
Date:   Mon Nov 15 14:24:15 2010 -0800

    (#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 at puppetlabs.com>

diff --git a/lib/puppet/util/metric.rb b/lib/puppet/util/metric.rb
index 90a2448..8f55e7b 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

-- 
Puppet packaging for Debian