diff options
| author | Pieter van de Bruggen <pieter@puppetlabs.com> | 2011-05-17 14:50:40 -0700 |
|---|---|---|
| committer | Pieter van de Bruggen <pieter@puppetlabs.com> | 2011-05-17 14:50:40 -0700 |
| commit | f9e44f041b3fdc120b1c78554c35c83f7517152e (patch) | |
| tree | f5d4687277fff6fe697a92089f1fa9283dce1bb4 /lib/puppet/util | |
| parent | 99d437d2bbc2339f092304715ec562fbbcb0a50c (diff) | |
| parent | c8b294a0b0a1fc91a64c0a1ac3bab3b2aec92faf (diff) | |
Merge branch '2.7.x' into 2.7.next
Diffstat (limited to 'lib/puppet/util')
| -rw-r--r-- | lib/puppet/util/selinux.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/util/selinux.rb b/lib/puppet/util/selinux.rb index cec8a57d9..255388d58 100644 --- a/lib/puppet/util/selinux.rb +++ b/lib/puppet/util/selinux.rb @@ -140,7 +140,7 @@ module Puppet::Util::SELinux def read_mounts mounts = "" begin - if File.instance_methods.include? "read_nonblock" + if File.method_defined? "read_nonblock" # If possible we use read_nonblock in a loop rather than read to work- # a linux kernel bug. See ticket #1963 for details. mountfh = File.open("/proc/mounts") |