On 07/01/2010 02:51 PM, Luke Kanies wrote:
3) Would the preferred fix for 2, assuming a bug, to fix this in the
Puppet::Util::Settings.searchpath method (substitute @name for :name
if known) or in the Puppet::Util::Settings.unsafe_parse method?
If you're using a recent enough version, I'd recommend disabling
'manage_internal_file_permissions', at least for now.
Obviously, the best thing is if this actually works for you. I think 2.6
will make this name-based searching work.
Attached is a patch for the 0.25.x branch. It adds name lookup to the
parsing of the config file.
-- bk
--
You received this message because you are subscribed to the Google Groups "Puppet
Developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/puppet-dev?hl=en.
>From 63030bd4c22ff837f14be7c462125f48d2f6fb37 Mon Sep 17 00:00:00 2001
From: Bryan Kearney <[email protected]>
Date: Thu, 1 Jul 2010 16:39:09 -0400
Subject: [PATCH] Use the name in the search path for looking for metadata
---
lib/puppet/util/settings.rb | 1 +
lib/puppet/util/settings/file_setting.rb | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
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
--
1.6.6.1
