[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 0.25.5-639-g8f94f35

[Markus Roberts]

The following commit has been merged in the upstream branch:
commit 70af43f915110b806dc156fd09c3aa8ec7b0fe0d
Author: Markus Roberts <Markus at reality.com>
Date:   Wed Jul 7 17:13:19 2010 -0700

    Fix for #4167 -- overriding file permissions in conf file
    
    The logic which iterates over the searchpath in reverse does not translate the name.
    Therefore file overrides in :master or :agent are not picked up.

diff --git a/lib/puppet/util/settings.rb b/lib/puppet/util/settings.rb
index e1f7c35..9923713 100644
--- a/lib/puppet/util/settings.rb
+++ b/lib/puppet/util/settings.rb
@@ -364,6 +364,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 = run_mode if source == :run_mode
             if meta = metas[source]
                 set_metadata(meta)
             end
diff --git a/lib/puppet/util/settings/file_setting.rb b/lib/puppet/util/settings/file_setting.rb
index 732af0b..6f0f315 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