[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, master, updated. debian/0.24.7-1-98-gf19c0e5

[James Turnbull]

The following commit has been merged in the master branch:
commit 535fa89af0b87f1d514d75040c1da7795d1dc87e
Author: James Turnbull <james at lovedthanlost.net>
Date:   Wed Feb 11 08:48:27 2009 +1100

    Fixed #1538 - Yumrepo sets permissions wrongly on files in /etc/yum.repos.d

diff --git a/CHANGELOG b/CHANGELOG
index 619629a..8721c61 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,6 @@
 0.24.8
+    Fixed #1538 - Yumrepo sets permissions wrongly on files in /etc/yum.repos.d
+
     Fixed #1936 - Added /* */ support to the vim file
 
     Fixed #1541 -  nagios objects write files to clientbucket on every change
diff --git a/lib/puppet/type/yumrepo.rb b/lib/puppet/type/yumrepo.rb
index 15e0319..164deaf 100644
--- a/lib/puppet/type/yumrepo.rb
+++ b/lib/puppet/type/yumrepo.rb
@@ -177,7 +177,10 @@ module Puppet
 
         # Store all modifications back to disk
         def self.store
-            inifile.store
+            file = inifile.store
+            unless file.nil?
+                File.chmod(0644, file)
+            end
         end
 
         def self.clear
diff --git a/lib/puppet/util/inifile.rb b/lib/puppet/util/inifile.rb
index 9f5582e..f5fab85 100644
--- a/lib/puppet/util/inifile.rb
+++ b/lib/puppet/util/inifile.rb
@@ -163,6 +163,7 @@ module Puppet::Util::IniConfig
                 end
                 if dirty
                     Puppet::Util::FileType.filetype(:flat).new(file).write(text)
+                    return file
                 end
             end
         end

-- 
Puppet packaging for Debian