Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

merge queue: embarking 3.10 (36a7f2f) and #9125 together #9127

Closed
wants to merge 3 commits into from
Closed

merge queue: embarking 3.10 (36a7f2f) and #9125 together #9127

wants to merge 3 commits into from

Commits on Jul 14, 2023

  1. Fix parsing of password-command option (#6268) 

    The password-command option does not parse its value correctly.
Quotes are ignored, making many kinds of commands impossible to
express (e.g.  `sh -c "foo | bar"`).  Also, `cabal user-config`
treats the argument list as a *list of option values*, rather than a
*value that is a list*.  As a consequence, `cabal user-config
update` corrupts the value in the config file.

Fix these issues by parsing the command as a space separated list of
tokens, and changing the getter to `unwords` the value and return a
*singleton* list.  Also update the argument placeholder from
`PASSWORD` to `COMMAND`.

Fixes: #6268
(cherry picked from commit 95f48ad)

# Conflicts:
#	cabal-install/src/Distribution/Client/Setup.hs
#	cabal-install/src/Distribution/Deprecated/ParseUtils.hs
    @frasertweedale @mergify
    frasertweedale authored and mergify[bot] committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    e08b465 View commit details
    Browse the repository at this point in the history

  2. fix conflicts

    @ulysses4ever
    ulysses4ever committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    9939338 View commit details
    Browse the repository at this point in the history

  3. Merge of #9125

    @mergify
    mergify[bot] authored Jul 14, 2023
    Configuration menu
    Copy the full SHA
    0d65daa View commit details
    Browse the repository at this point in the history