Merge commit 'davids-bugfixes/rest/fix-815-by-using-main-explicitly'

6 files changed, 8 insertions, 14 deletions

diff --git a/lib/puppet/indirector/report/processor.rb b/lib/puppet/indirector/report/processor.rb
index d2b7c84f3..fd1bc413a 100644
--- a/lib/puppet/indirector/report/processor.rb
+++ b/lib/puppet/indirector/report/processor.rb
@@ -7,7 +7,7 @@ class Puppet::Transaction::Report::Processor < Puppet::Indirector::Code
         the report types listed in the 'reports' setting."
 
     def initialize
-        Puppet.settings.use(:reporting, :metrics)
+        Puppet.settings.use(:main, :reporting, :metrics)
     end
 
     def save(report)
diff --git a/lib/puppet/network/handler/report.rb b/lib/puppet/network/handler/report.rb
index 12abc9b15..8ddeed9f6 100755
--- a/lib/puppet/network/handler/report.rb
+++ b/lib/puppet/network/handler/report.rb
@@ -18,7 +18,7 @@ class Puppet::Network::Handler
 
         def initialize(*args)
             super
-            Puppet.settings.use(:reporting, :metrics)
+            Puppet.settings.use(:main, :reporting, :metrics)
         end
 
         # Accept a report from a client.
diff --git a/lib/puppet/reports/store.rb b/lib/puppet/reports/store.rb
index dfc992820..b7ef42a7b 100644
--- a/lib/puppet/reports/store.rb
+++ b/lib/puppet/reports/store.rb
@@ -1,7 +1,7 @@
 require 'puppet'
 
 Puppet::Reports.register_report(:store) do
-    Puppet.settings.use(:reporting)
+    Puppet.settings.use(:main, :reporting)
 
     desc "Store the yaml report on disk.  Each host sends its report as a YAML dump
         and this just stores the file on disk, in the ``reportdir`` directory.
diff --git a/lib/puppet/util/metric.rb b/lib/puppet/util/metric.rb
index d0719ff3b..ca23aa87f 100644
--- a/lib/puppet/util/metric.rb
+++ b/lib/puppet/util/metric.rb
@@ -21,7 +21,7 @@ class Puppet::Util::Metric
     end
 
     def create(start = nil)
-        Puppet.settings.use(:metrics)
+        Puppet.settings.use(:main, :metrics)
 
         start ||= Time.now.to_i - 5
 
diff --git a/lib/puppet/util/settings.rb b/lib/puppet/util/settings.rb
index 0bd288ec2..1db396dc4 100644
--- a/lib/puppet/util/settings.rb
+++ b/lib/puppet/util/settings.rb
@@ -643,13 +643,6 @@ Generated on #{Time.now}.
                 @used = []
             end
 
-            runners = sections.collect { |s|
-                symbolize(s)
-            }.find_all { |s|
-                ! @used.include? s
-            }
-            return if runners.empty?
-
             bucket = to_transportable(*sections)
 
             config = bucket.to_configuration
@@ -661,7 +654,8 @@ Generated on #{Time.now}.
             end
             config.clear
 
-            runners.each { |s| @used << s }
+            sections.each { |s| @used << s }
+            @used.uniq
         end
     end
 
diff --git a/test/other/report.rb b/test/other/report.rb
index c45fa740b..1ccb44546 100755
--- a/test/other/report.rb
+++ b/test/other/report.rb
@@ -87,7 +87,7 @@ class TestReports < Test::Unit::TestCase
         
         # We have to reuse reporting here because of something going on in the
         # server/report.rb file
-        Puppet.settings.use(:reporting)
+        Puppet.settings.use(:main, :reporting)
 
         3.times { |i|
             log = Puppet.warning("Report test message %s" % i)
@@ -114,7 +114,7 @@ class TestReports < Test::Unit::TestCase
 
     if Puppet.features.rrd?
     def test_rrdgraph_report
-        Puppet.settings.use(:metrics)
+        Puppet.settings.use(:main, :metrics)
         report = mkreport
 
         assert(! report.metrics.empty?, "Did not receive any metrics")