(PUP-5018) Cannot unlink dangling Windows symlinks #4147
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -62,7 +62,9 @@ def unlink(*file_names) | |||
| stat = Puppet::Util::Windows::File.stat(file_name) rescue nil | |||
|
|
|||
| # sigh, Ruby + Windows :( | |||
| if stat && stat.ftype == 'directory' | |||
| if !stat | |||
There was a problem hiding this comment.
Now I understand what you meant by nil coming back.
Iristyle
force-pushed
the
ticket/stable/PUP-5018-Windows-unlink-fails-on-orphaned-links
branch
from
a599f60
to
da86ca3
Compare
|
Once it's green it's gold. |
| Puppet::FileSystem.unlink(symlink) | ||
|
|
||
| expect(Puppet::FileSystem.exist?(dir)).to be_falsey | ||
| expect(Puppet::FileSystem.exist?(dir)).to be_falsey |
There was a problem hiding this comment.
Oh shoot.. typo here.
Iristyle
force-pushed
the
ticket/stable/PUP-5018-Windows-unlink-fails-on-orphaned-links
branch
from
da86ca3
to
ba44550
Compare
| ::File.delete(file) | ||
| Puppet::FileSystem.unlink(symlink) | ||
|
|
||
| expect(Puppet::FileSystem.exist?(file)).to be_falsey |
There was a problem hiding this comment.
minor nit, for predicate methods you'll get better error messages if you do something like:
expect(Puppet::FileSystem).to_not be_exist(file)
- When a symlink is created to point at a directory, then that target directory is removed, Windows was previously generating `Errno::EACCES: Permission denied @ unlink_internal` because the underlying Ruby File.unlink was being called, which fails on Windows. When the target no longer exists, Ruby's File.unlink only works properly on symlinks pointed at files and not symlinks pointed at directories. Given the lstat only specifies 'link' and does not describe the target, there is no way of knowing whether the former target was a file or directory. Thefore, when the target stat does not exist, first attempt to File.unlink, and if that fails call Dir.rmdir. Ruby's Dir.rmdir only works on links that were targeted at directories, and not links that were targeted at files.
Iristyle
force-pushed
the
ticket/stable/PUP-5018-Windows-unlink-fails-on-orphaned-links
branch
from
ba44550
to
579d5ea
Compare
|
This looks good to move in. |
ferventcoder
added a commit
that referenced
this pull request
Aug 13, 2015
…-unlink-fails-on-orphaned-links (PUP-5018) Cannot unlink dangling Windows symlinks
|
Merged to master at 7a87738 |
Iristyle
deleted the
ticket/stable/PUP-5018-Windows-unlink-fails-on-orphaned-links
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When a symlink is created to point at a directory, then that target
directory is removed, Windows was previously generating
Errno::EACCES: Permission denied @ unlink_internalbecause theunderlying Ruby File.unlink was being called, which fails on Windows.
When the target no longer exists, Ruby's File.unlink only works
properly on symlinks pointed at files and not symlinks pointed at
directories
Given the lstat only specifies 'link' and does not describe the
target, there is no way of knowing whether the former target was a
file or directory. Thefore, when the target stat does not exist,
first attempt to File.unlink, and if that fails call Dir.rmdir.
Ruby's Dir.rmdir only works on links that were targeted at
directories, and not links that were targeted at files.