[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, master, updated. debian/0.24.6-1-356-g5718585

[James Turnbull]

The following commit has been merged in the master branch:
commit 030c7913643fa9b37b54815b09ee03427c4849ef
Author: James Turnbull <james at lovedthanlost.net>
Date:   Mon Nov 17 21:07:08 2008 +1100

    Moved RRD feature from util/metric.rb to feature/base.rb

diff --git a/CHANGELOG b/CHANGELOG
index 82bcd6f..1a03dc4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,6 @@
 0.24.x
+    Moved RRD feature from util/metric.rb to feature/base.rb
+
     Fixed #1735 and #1747 - Fixes to confine system
 
     Fixed #1681 - Add filesystem type check to test for per-file SELinux context support
diff --git a/lib/puppet/feature/base.rb b/lib/puppet/feature/base.rb
index 0b12d73..c3fb9a2 100644
--- a/lib/puppet/feature/base.rb
+++ b/lib/puppet/feature/base.rb
@@ -25,3 +25,6 @@ Puppet.features.add :diff, :libs => %w{diff/lcs diff/lcs/hunk}
 
 # We have augeas
 Puppet.features.add(:augeas, :libs => ["augeas"])
+
+# We have RRD available
+Puppet.features.add(:rrd, :libs => ["RRDtool"])
diff --git a/lib/puppet/util/metric.rb b/lib/puppet/util/metric.rb
index e6d7678..f352462 100644
--- a/lib/puppet/util/metric.rb
+++ b/lib/puppet/util/metric.rb
@@ -4,11 +4,6 @@ require 'puppet'
 # A class for handling metrics.  This is currently ridiculously hackish.
 class Puppet::Util::Metric
     
-    # Load the library as a feature, so we can test its presence.
-    # It's only used by this class, so there's no reason to move it
-    # to the main feature list.
-    Puppet.features.add :rrd, :libs => 'RRDtool'
-
     attr_accessor :type, :name, :value, :label
     attr_writer :values
 

-- 
Puppet packaging for Debian