[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. puppet-0.24.5-rc3-1456-g2f0b1e5

[James Turnbull]

The following commit has been merged in the upstream branch:
commit dcf0d0d726ecec8c6180e2443b4b94b6d4ea4abf
Author: James Turnbull <james at lovedthanlost.net>
Date:   Fri Sep 18 06:50:18 2009 +1000

    Fix #2652 - Fix SELinux syntax error

diff --git a/lib/puppet/util/selinux.rb b/lib/puppet/util/selinux.rb
index 348eab7..bdf4415 100644
--- a/lib/puppet/util/selinux.rb
+++ b/lib/puppet/util/selinux.rb
@@ -159,18 +159,17 @@ module Puppet::Util::SELinux
                 # a linux kernel bug.  See ticket #1963 for details.
                 mountfh = File.open("/proc/mounts")
                 mounts += mountfh.read_nonblock(1024) while true
-                end
             else
                 # Otherwise we shell out and let cat do it for us
                 mountfh = IO.popen("/bin/cat /proc/mounts")
                 mounts = mountfh.read
             end
-        ensure        
-            mountfh.close
         rescue EOFError
             # that's expected
         rescue
             return nil
+        ensure        
+            mountfh.close
         end
 
         mntpoint = {}

-- 
Puppet packaging for Debian