diff options
| author | Markus Roberts <Markus@reality.com> | 2009-12-18 09:11:09 -0800 |
|---|---|---|
| committer | Markus Roberts <Markus@reality.com> | 2009-12-18 09:11:09 -0800 |
| commit | d11c7503cc816e98b5deb890b49a7e8c47173e1b (patch) | |
| tree | 5fb76ea4708a7758d744b71b022dc32eca895238 /lib/puppet/util/selinux.rb | |
| parent | 0dc2dbafe65b59bfbb3ab66e26f595260bdde356 (diff) | |
| download | puppet-d11c7503cc816e98b5deb890b49a7e8c47173e1b.tar.gz puppet-d11c7503cc816e98b5deb890b49a7e8c47173e1b.tar.xz puppet-d11c7503cc816e98b5deb890b49a7e8c47173e1b.zip | |
Fix for #2951 (SELinux test errors on OS X)
This makes the SELinux library marginally more robust by dealing
consistently with a missing proc/mounts, and also resoves the test
failures in a way that allows meaningful test runs on non-SELinux
systems.
Signed-off-by: Markus Roberts <Markus@reality.com>
Diffstat (limited to 'lib/puppet/util/selinux.rb')
| -rw-r--r-- | lib/puppet/util/selinux.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/util/selinux.rb b/lib/puppet/util/selinux.rb index 331c8eb82..628a6ec23 100644 --- a/lib/puppet/util/selinux.rb +++ b/lib/puppet/util/selinux.rb @@ -166,8 +166,8 @@ module Puppet::Util::SELinux # that's expected rescue return nil - ensure - mountfh.close + ensure + mountfh.close if mountfh end mntpoint = {} |