diff options
-rw-r--r-- | lib/puppet/type/yumrepo.rb | 13 | ||||
-rw-r--r-- | lib/puppet/util/inifile.rb | 8 |
2 files changed, 18 insertions, 3 deletions
diff --git a/lib/puppet/type/yumrepo.rb b/lib/puppet/type/yumrepo.rb index 5d6a727f6..39b9cd30a 100644 --- a/lib/puppet/type/yumrepo.rb +++ b/lib/puppet/type/yumrepo.rb @@ -178,9 +178,16 @@ module Puppet # Store all modifications back to disk def self.store - file = inifile.store - unless file.nil? - File.chmod(0644, file) + inifile.store + unless Puppet[:noop] + target_mode = 0644 # FIXME: should be configurable + inifile.each_file do |file| + current_mode = File.stat(file).mode & 0777 + unless current_mode == target_mode + Puppet::info "changing mode of #{file} from %03o to %03o" % [current_mode, target_mode] + File.chmod(target_mode, file) + end + end end end diff --git a/lib/puppet/util/inifile.rb b/lib/puppet/util/inifile.rb index 3c82f7d37..eb943fe13 100644 --- a/lib/puppet/util/inifile.rb +++ b/lib/puppet/util/inifile.rb @@ -180,6 +180,14 @@ module Puppet::Util::IniConfig end end + # Execute BLOCK, passing each file constituting this inifile + # as an argument + def each_file(&block) + @files.keys.each do |file| + yield(file) + end + end + # Return the Section with the given name or nil def [](name) name = name.to_s |