Skip to content

Fix a Couple Windows Issues #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 26, 2019
Merged

Fix a Couple Windows Issues #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0ce0fef
Fix test_cp_r_dev on Windows or other systems without character/block…
jeremyevans Aug 23, 2019
7359cef
Fix cp_r with symlink root on Windows
jeremyevans Aug 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion lib/fileutils.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,7 +488,11 @@ def cp_r(src, dest, preserve: nil, noop: nil, verbose: nil,
# If +remove_destination+ is true, this method removes each destination file before copy.
#
def copy_entry(src, dest, preserve = false, dereference_root = false, remove_destination = false)
Entry_.new(src, nil, dereference_root).wrap_traverse(proc do |ent|
if dereference_root
src = File.realpath(src)
end

Entry_.new(src, nil, false).wrap_traverse(proc do |ent|
destent = Entry_.new(dest, ent.rel, false)
File.unlink destent.path if remove_destination && (File.file?(destent.path) || File.symlink?(destent.path))
ent.copy destent.path
Expand Down
8 changes: 4 additions & 4 deletions test/fileutils/test_fileutils.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,11 +449,11 @@ def test_cp_r_fifo

def test_cp_r_dev
devs = Dir['/dev/*']
chardev = Dir['/dev/*'].find{|f| File.chardev?(f)}
blockdev = Dir['/dev/*'].find{|f| File.blockdev?(f)}
chardev = devs.find{|f| File.chardev?(f)}
blockdev = devs.find{|f| File.blockdev?(f)}
Dir.mkdir('tmp/cpr_dest')
assert_raise(RuntimeError) { cp_r chardev, 'tmp/cpr_dest/cd' }
assert_raise(RuntimeError) { cp_r blockdev, 'tmp/cpr_dest/bd' }
assert_raise(RuntimeError) { cp_r chardev, 'tmp/cpr_dest/cd' } if chardev
assert_raise(RuntimeError) { cp_r blockdev, 'tmp/cpr_dest/bd' } if blockdev
end

begin
Expand Down