diff options
| author | Bryan Kearney <bkearney@redhat.com> | 2010-07-01 16:39:09 -0400 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2010-07-03 00:29:25 +1000 |
| commit | 83d9874e2eba003d83f089a6e6c278f5976d5154 (patch) | |
| tree | 4dec4dd73ce4a759520ebdb7b0d556ded42183cb /lib/puppet | |
| parent | 70c293abd1b1e506343223515a32e34a15de1a12 (diff) | |
| download | puppet-83d9874e2eba003d83f089a6e6c278f5976d5154.tar.gz puppet-83d9874e2eba003d83f089a6e6c278f5976d5154.tar.xz puppet-83d9874e2eba003d83f089a6e6c278f5976d5154.zip | |
Use the name in the search path for looking for metadata
Diffstat (limited to 'lib/puppet')
| -rw-r--r-- | lib/puppet/util/settings.rb | 1 | ||||
| -rw-r--r-- | 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 002bc0b1a..f859dac62 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 2dfbcf46e..e8cebaf33 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 |