Update subtree: libglnx 2024-12-06 #6043
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
Meson 1.1.0 officially deprecates string defaults for boolean options, but boolean defaults worked in many older Meson versions, going back to at least 0.49.x. Signed-off-by: Simon McVittie <[email protected]>
build: Use a boolean default for a boolean option, rather than a string See merge request GNOME/libglnx!60
Otherwise it could potentially race with tests in other executables that also want to create `./test`, or interfere with other test-cases in the same executable that expect `./test` to be nonexistent or empty. Signed-off-by: Simon McVittie <[email protected]>
If we try to create `link/content` where `link` is a dangling symlink, recursing to create `link` will succeed (mkdirat fails with EEXIST, which is explicitly ignored), but then mkdirat for `link/content` will still fail. Fail gracefully instead of crashing out with an assertion failure. Resolves: GNOME/libglnx#1 Signed-off-by: Simon McVittie <[email protected]>
This is a slight generalization of the reproducer contributed by Will Thompson: as well as exercising the case where the parent is a dangling symlink (reproducing GNOME/libglnx#1), this also exercises the case where the parent is a non-directory non-symlink (in this case a regular file). Reproduces: GNOME/libglnx#1 Co-authored-by: Will Thompson <[email protected]> Signed-off-by: Simon McVittie <[email protected]>
glnx-shutil: Cope with ENOENT even after recursing to create parents Closes #1 See merge request GNOME/libglnx!62
* Fix an assertion failure attempting to create a directory that exists as a dangling symlink[1] * Fix a Meson deprecation warning[2] [1] https://gitlab.gnome.org/GNOME/libglnx/-/issues/1 [2] https://gitlab.gnome.org/GNOME/libglnx/-/merge_requests/60 Signed-off-by: Simon McVittie <[email protected]>
GeorgesStavracas
approved these changes
Dec 23, 2024
There was a problem hiding this comment.
LGTM. I'll leave it up to you @smcv whether to merge this or not before 1.16.0 is out
|
Normally I only update libglnx on the development branch, but this is a simple bugfix-only change which I would have been happy to land into 1.16.x, so I think it's equally OK as a minor fix between release-candidate and stable release. |
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.
as a dangling symlink (GNOME/libglnx#1)