Ignore invalid Unicode in pkg-config descriptions (backport #9609) #9658
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
![mergify[bot]](https://avatars.githubusercontent.com/in/10562?s=60&v=4){kind=small}
3 tasks
|
The diff in the original PR for the conflicted region of So this should be easy to fix for someone with permissions to push to this branch. |
Mikolaj
approved these changes
Jan 25, 2024
Mikolaj
reviewed
Jan 25, 2024
Mikolaj
reviewed
Jan 25, 2024
Comment on lines
30
to
27
| IOEncoding (..) | ||
| , emptyProgramInvocation | ||
| , simpleProgramInvocation | ||
| , programInvocation | ||
| , multiStageProgramInvocation | ||
| , runProgramInvocation | ||
| , getProgramInvocationOutput | ||
| , getProgramInvocationLBS | ||
| , getProgramInvocationLBSAndErrors |
There was a problem hiding this comment.
Suggested change
| IOEncoding (..) | |
| , emptyProgramInvocation | |
| , simpleProgramInvocation | |
| , programInvocation | |
| , multiStageProgramInvocation | |
| , runProgramInvocation | |
| , getProgramInvocationOutput | |
| , getProgramInvocationLBS | |
| , getProgramInvocationLBSAndErrors |
There was a problem hiding this comment.
Doh, and I finally removed the only bit that was important: getProgramInvocationLBSAndErrors. How do I revert suggestions?
There was a problem hiding this comment.
I can't find a way, so I will have to check out the branch, fix and push, after all.
* Ignore invalid Unicode in pkg-config descriptions Previously, if any of the pkg-config packages on the system had invalid Unicode in their description fields (like the Intel vpl package has at the time of writing, 2024-01-11, see #9608), cabal would crash because it tried to interpret the entire `pkg-config --list-all` output as Unicode. This change, as suggested by gbaz in #9608 (comment) switches to using a lazy ByteString for reading in the output, splitting on the first space in byte land, and then parsing only the package _name_ to a String. For further future-proofing, package names that don't parse as valid Unicode don't crash Cabal, but are instead ignored. * Add changelog entry * cabal-install-solver: Add bounds on 'text' * No literal ASCII values, use 'ord' * Address review comments re invalid unicode from pkg-config * Add test for invalid unicode from pkg-config * Compatibility with text-1.2.5.0 * Align imports * Handle different exception type * Use only POSIX shell syntax * Add invalid-input handler in pkg-config shim This is to appease shellcheck * Actually implement all required stuff in the pkg-config shim * Less exception dance * Fix shebang lines MacOS doesn't have /usr/bin/sh, and /bin/sh is the standard (for a POSIX shell) anyway * Don't expect a particular representation of invalid characters --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> (cherry picked from commit 0b34b4e)
Mikolaj
force-pushed
the
mergify/bp/3.10/pr-9609
branch
from
66568d5 to
d4dff63
Compare
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.
This is an automatic backport of pull request #9609 done by Mergify.
Cherry-pick of 0b34b4e has failed:
To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally
Mergify commands and options
More conditions and actions can be found in the documentation.
You can also trigger Mergify actions by commenting on this pull request:
@Mergifyio refreshwill re-evaluate the rules@Mergifyio rebasewill rebase this PR on its base branch@Mergifyio updatewill merge the base branch into this PR@Mergifyio backport <destination>will backport this PR on<destination>branchAdditionally, on Mergify dashboard you can:
Finally, you can contact us on https://mergify.com