From 0e467869f4d427a8c42e1c2ff6a0bb215f288b09 Mon Sep 17 00:00:00 2001
From: James Turnbull <james@lovedthanlost.net>
Date: Sat, 28 Feb 2009 03:05:23 +1100
Subject:  Fixed #1963 - Failing to read /proc/mounts for selinux kills file
 downloads

---
 lib/puppet/util/selinux.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'lib/puppet/util')

diff --git a/lib/puppet/util/selinux.rb b/lib/puppet/util/selinux.rb
index 70f244507..cd3b2ac1a 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
-- 
cgit 


From 69a0f7dc8d3ba1c64e5acdf99628f10b41ab8e30 Mon Sep 17 00:00:00 2001
From: Brice Figureau <brice-puppet@daysofwonder.com>
Date: Fri, 19 Dec 2008 17:35:08 +0100
Subject: Fix #1807 - make Puppet::Util::Package.versioncmp a module function

Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>
---
 lib/puppet/util/package.rb | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'lib/puppet/util')

diff --git a/lib/puppet/util/package.rb b/lib/puppet/util/package.rb
index 00e04f64a..613aa6b1e 100644
--- a/lib/puppet/util/package.rb
+++ b/lib/puppet/util/package.rb
@@ -28,4 +28,6 @@ module Puppet::Util::Package
         end
         return version_a <=> version_b;
     end
+    
+    module_function :versioncmp
 end
-- 
cgit 


From a677e26eb1452c08d7724047a18e50f4a654d2cd Mon Sep 17 00:00:00 2001
From: Luke Kanies <luke@madstop.com>
Date: Thu, 2 Apr 2009 19:41:17 -0500
Subject: Fixing all tests that were apparently broken in the 0.24.x merge.

Signed-off-by: Luke Kanies <luke@madstop.com>
---
 lib/puppet/util/selinux.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/puppet/util')

diff --git a/lib/puppet/util/selinux.rb b/lib/puppet/util/selinux.rb
index cd3b2ac1a..f13600680 100644
--- a/lib/puppet/util/selinux.rb
+++ b/lib/puppet/util/selinux.rb
@@ -153,7 +153,7 @@ module Puppet::Util::SELinux
     # Internal helper function to read and parse /proc/mounts
     def read_mounts
         begin
-            mountfh = File.open("/proc/mounts", NONBLOCK)
+            mountfh = File.open("/proc/mounts", File::NONBLOCK)
             mounts = mountfh.read
             mountfh.close
         rescue
-- 
cgit