[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 2.6.1rc1-141-gcdb2b90

[James Turnbull]

The following commit has been merged in the upstream branch:
commit 83d9874e2eba003d83f089a6e6c278f5976d5154
Author: Bryan Kearney <bkearney at redhat.com>
Date:   Thu Jul 1 16:39:09 2010 -0400

    Use the name in the search path for looking for metadata

diff --git a/lib/puppet/util/settings.rb b/lib/puppet/util/settings.rb
index 002bc0b..f859dac 100644
--- a/lib/puppet/util/settings.rb
+++ b/lib/puppet/util/settings.rb
@@ -380,6 +380,7 @@ class Puppet::Util::Settings
         # because multiple sections could set the same value
         # and I'm too lazy to only set the metadata once.
         searchpath.reverse.each do |source|
+            source = @name if (@name && source == :name)
             if meta = @values[source][:_meta]
                 set_metadata(meta)
             end
diff --git a/lib/puppet/util/settings/file_setting.rb b/lib/puppet/util/settings/file_setting.rb
index 2dfbcf4..e8cebaf 100644
--- a/lib/puppet/util/settings/file_setting.rb
+++ b/lib/puppet/util/settings/file_setting.rb
@@ -3,7 +3,7 @@ require 'puppet/util/settings/setting'
 # A file.
 class Puppet::Util::Settings::FileSetting < Puppet::Util::Settings::Setting
     AllowedOwners = %w{root service}
-    AllowedGroups = %w{service}
+    AllowedGroups = %w{root service}
 
     class SettingError < StandardError; end
 

-- 
Puppet packaging for Debian