diff options
| author | sdelano <stephen@opscode.com> | 2012-12-12 16:01:19 -0800 |
|---|---|---|
| committer | Bryan McLellan <btm@opscode.com> | 2012-12-25 08:51:03 -0800 |
| commit | c739928ed93bde5572e7843dbbe8ff2e62f72766 (patch) | |
| tree | 978a3f5c3615a611bd985f535b924201122b5662 | |
| parent | b6df419e83ed8c6d8fbebcdef22328ee0e346404 (diff) | |
| download | chef-c739928ed93bde5572e7843dbbe8ff2e62f72766.tar.gz | |
CHEF-3660: only monkeypatch on ruby 1.9 and earlier
| -rw-r--r-- | chef/lib/chef/monkey_patches/fileutils.rb | 62 |
1 files changed, 32 insertions, 30 deletions
diff --git a/chef/lib/chef/monkey_patches/fileutils.rb b/chef/lib/chef/monkey_patches/fileutils.rb index 4b2b24bb34..f18bead144 100644 --- a/chef/lib/chef/monkey_patches/fileutils.rb +++ b/chef/lib/chef/monkey_patches/fileutils.rb @@ -22,41 +22,43 @@ # patched in the trunk of Ruby, and this is a monkey patch of the offending # code. -require 'fileutils' +unless RUBY_VERSION =~ /^2/ + require 'fileutils' -class FileUtils::Entry_ - def copy_metadata(path) - st = lstat() - if !st.symlink? - File.utime st.atime, st.mtime, path - end - begin - if st.symlink? - begin - File.lchown st.uid, st.gid, path - rescue NotImplementedError - end - else - File.chown st.uid, st.gid, path + class FileUtils::Entry_ + def copy_metadata(path) + st = lstat() + if !st.symlink? + File.utime st.atime, st.mtime, path end - rescue Errno::EPERM - # clear setuid/setgid - if st.symlink? - begin - File.lchmod st.mode & 01777, path - rescue NotImplementedError + begin + if st.symlink? + begin + File.lchown st.uid, st.gid, path + rescue NotImplementedError + end + else + File.chown st.uid, st.gid, path end - else - File.chmod st.mode & 01777, path - end - else - if st.symlink? - begin - File.lchmod st.mode, path - rescue NotImplementedError + rescue Errno::EPERM + # clear setuid/setgid + if st.symlink? + begin + File.lchmod st.mode & 01777, path + rescue NotImplementedError + end + else + File.chmod st.mode & 01777, path end else - File.chmod st.mode, path + if st.symlink? + begin + File.lchmod st.mode, path + rescue NotImplementedError + end + else + File.chmod st.mode, path + end end end end |