Fix install: invalid link at destination #5851
Merged
Conversation
This file contains hidden or 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
a9b9a50 to
5d5b430
Compare
b5f9578 to
de8951b
Compare
efc9e9a to
b08bcca
Compare
|
Nice find! I think the behaviour might be even more general. Looking at the output of This is the GNU |
|
The documentation of fs::copy states explicitly that any file at destination will be overwritten. So its not needed for us to delete the file explicitly before. But we could remove the check if the exisiting destination is a link. This would simplify the code a bit. |
|
Yeah I think that makes sense! We could still include a little comment to explain why it's necessary. |
|
done |
b29bda3 to
b88dff6
Compare
ac88ea2 to
2559a51
Compare
2559a51 to
e113d77
Compare
|
GNU testsuite comparison: |
603e11e to
95728d1
Compare
8bcb690 to
48b49a5
Compare
|
GNU testsuite comparison: |
ade9118 to
ded50d4
Compare
sylvestre
reviewed
Mar 10, 2024
src/uu/install/src/install.rs
Outdated
Comment on lines
753
to
761
| match fs::remove_file(to) { | ||
| Ok(()) => {} | ||
| Err(e) if e.kind() == std::io::ErrorKind::NotFound => { /* expected */ } | ||
| Err(e) => { | ||
| show_error!( | ||
| "Failed to remove existing file {}. Error: {:?}", | ||
| to.display(), | ||
| e | ||
| ); | ||
| } | ||
| } |
There was a problem hiding this comment.
can it be simplified this way ?
Suggested change
| match fs::remove_file(to) { | |
| Ok(()) => {} | |
| Err(e) if e.kind() == std::io::ErrorKind::NotFound => { /* expected */ } | |
| Err(e) => { | |
| show_error!( | |
| "Failed to remove existing file {}. Error: {:?}", | |
| to.display(), | |
| e | |
| ); | |
| } | |
| } | |
| if let Err(e) = fs::remove_file(to) { | |
| if e.kind() != std::io::ErrorKind::NotFound { | |
| show_error!("Failed to remove existing file {}. Error: {:?}", to.display(), e); | |
| } | |
| } | |
There was a problem hiding this comment.
true. done. Thanks :-)
also remove some FixMEs for FreeBsd
ded50d4 to
7cd754e
Compare
|
sweet, well done :) |
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.
addresses issue #3565
Problem is that
fs::copyfails when at the destination an invalid symbolic link exists.I guess it tries to write to the file which the existing destination link points to.
Not sure if this should be even reported as an issue to rustlib itself.
The workaround I implemented is to check if the existing file is any link and remove it.
I didn't implement to check for invalid links. So all existing links will be removed before
fs::copyis called.EDIT: We simplified it by just removing all existings target files before copy.
I'm no
installusecase expert, but I hope that there is no usecase where the existing link at destination needs to be used to redirect the writing of the data.Tests are extended accordingly.
EDIT Addition: As I have now a FreeBSD VM running, I was able to make some of the disabled tests running on FreeBSD.
Issue was mainly that we need a specific binary for stripping symbols for FreeBSD and that the
objdumpexecutable doesn't exists, but ratherllvm-objdump.