Fixing the provider's confine subsystem so the logs are more useful.

I apparently lost some context in these logs when I switched to this
separate subsystem.

Note that this also fixes some of the informational issues in

Signed-off-by: Luke Kanies <luke@madstop.com>

4 files changed, 10 insertions, 4 deletions

diff --git a/lib/puppet/provider/confine.rb b/lib/puppet/provider/confine.rb
index 70148fc33..ff97831ee 100644
--- a/lib/puppet/provider/confine.rb
+++ b/lib/puppet/provider/confine.rb
@@ -42,6 +42,9 @@ class Puppet::Provider::Confine
         for_binary
     end
 
+    # Used for logging.
+    attr_accessor :label
+
     def initialize(values)
         values = [values] unless values.is_a?(Array)
         @values = values
@@ -61,7 +64,7 @@ class Puppet::Provider::Confine
     def valid?
         values.each do |value|
             unless pass?(value)
-                Puppet.debug message(value)
+                Puppet.debug(label + ": " + message(value))
                 return false
             end
         end
diff --git a/lib/puppet/provider/confine/variable.rb b/lib/puppet/provider/confine/variable.rb
index 0ef90d6d8..c868a4e9e 100644
--- a/lib/puppet/provider/confine/variable.rb
+++ b/lib/puppet/provider/confine/variable.rb
@@ -25,7 +25,7 @@ class Puppet::Provider::Confine::Variable < Puppet::Provider::Confine
     end
 
     def message(value)
-        "facter value '%s' for '%s' not in required list '%s'" % [value, self.name, values.join(",")]
+        "facter value '%s' for '%s' not in required list '%s'" % [test_value, self.name, values.join(",")]
     end
 
     # Compare the passed-in value to the retrieved value.
diff --git a/lib/puppet/provider/confine_collection.rb b/lib/puppet/provider/confine_collection.rb
index 35f461acb..0dbdc7790 100644
--- a/lib/puppet/provider/confine_collection.rb
+++ b/lib/puppet/provider/confine_collection.rb
@@ -19,10 +19,13 @@ class Puppet::Provider::ConfineCollection
                 confine.name = test
                 @confines << confine
             end
+            @confines[-1].label = self.label
         end
     end
 
-    def initialize
+    attr_reader :label
+    def initialize(label)
+        @label = label
         @confines = []
     end
 
diff --git a/lib/puppet/provider/confiner.rb b/lib/puppet/provider/confiner.rb
index 4605523e8..65243efce 100644
--- a/lib/puppet/provider/confiner.rb
+++ b/lib/puppet/provider/confiner.rb
@@ -7,7 +7,7 @@ module Puppet::Provider::Confiner
 
     def confine_collection
         unless defined?(@confine_collection)
-            @confine_collection = Puppet::Provider::ConfineCollection.new
+            @confine_collection = Puppet::Provider::ConfineCollection.new(self.to_s)
         end
         @confine_collection
     end