Fix overwrite+remove deleting the wrong file on relative path. #235
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.
Fixes #234
The issue seems to be happening due to:
auto oldFilePath = pathToOldAppImage(pathToAppImage.value(), newFilePath);
checking in
pathToOldAppImage
if the paths are [trivially] equal with a == before, but newFilePath is gathered throughpathToNewFile
, which gets the data from the zSyncClient object:which internally calls
applyCwdToPathToLocalFile
, which one of the 3 places wherepathToLocalFile
is modified:which will make relative paths absolute, and keep absolute paths 100% equal
I haven't touched this codebase ever, so I'm just going based off vibes for the solution, if there's a better place to put to abspath - to keep the change minimal, that could likely be better, from what I can tell there's quite a few places in updater.cpp where the paths are normalized, like
Updater::restoreOriginalFile
andUpdater::copyPermissionsToNewFile
😅I'm not using Linux - so @Samueru-sama has been testing the code 🫡