[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 0e467869f4d427a8c42e1c2ff6a0bb215f288b09
Author: James Turnbull <james at lovedthanlost.net>
Date:   Sat Feb 28 03:05:23 2009 +1100

     Fixed #1963 - Failing to read /proc/mounts for selinux kills file downloads

diff --git a/CHANGELOG b/CHANGELOG
index 66bf088..c9ac112 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,6 @@
 0.24.8
+    Fixed #1963 - Failing to read /proc/mounts for selinux kills file downloads
+
     Fixed #2025 - gentoo service provider handle only default init level
 
     Fixed #1910 - updated logcheck
diff --git a/lib/puppet/util/selinux.rb b/lib/puppet/util/selinux.rb
index 70f2445..cd3b2ac 100644
--- a/lib/puppet/util/selinux.rb
+++ b/lib/puppet/util/selinux.rb
@@ -153,7 +153,9 @@ module Puppet::Util::SELinux
     # Internal helper function to read and parse /proc/mounts
     def read_mounts
         begin
-            mounts = File.read("/proc/mounts")
+            mountfh = File.open("/proc/mounts", NONBLOCK)
+            mounts = mountfh.read
+            mountfh.close
         rescue
             return nil
         end

-- 
Puppet packaging for Debian