python.pkgs.wrapPython: fix makeWrapperArgs #76283
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
When `makeWrapperArgs` is a Bash array, we only passed the first
item to `wrapProgram`. We need to use `"${makeWrapperArgs[@]}"`
to extract all the items. But that breaks the common string case so
we need to handle that case separately.
$ declare -a foo=(bar baz)
$ echo $foo
bar
$ declare -a bar=${foo[@]}
$ echo $bar
bar baz
$ declare -a bar=(${foo[@]})
$ echo $bar
bar
$ declare -a bar=("${foo[@]}")
$ echo $bar
bar
$ declare -a bar='("${foo[@]}")'
$ echo $bar
bar
$ qux='bar baz'
$ declare -a bar='("${qux[@]}")'
$ echo $bar
bar baz
$ declare -a bar='($qux)'
$ echo $bar
bar
|
|
@jtojnar I believe this works. But So all the |
worldofpeace
approved these changes
Dec 24, 2019
|
This broke pythonPackages.setuptools: |
|
Aargh, turns out there is a difference between local -a user_args="()"and local -a user_args
user_args="()" |
set -eux
a() {
local -a user_args="()"
declare -p user_args
}
b() {
local -a user_args
user_args="()"
declare -p user_args
}
a
bI long ran out of expletives for bash: + a
+ local -a 'user_args=()'
+ declare -p user_args
declare -a user_args=()
+ b
+ local -a user_args
+ user_args='()'
+ declare -p user_args
declare -a user_args=([0]="()") |
|
Since set -eux
c() {
if [[ "$(declare -p makeWrapperArgs)" =~ ^'declare -a makeWrapperArgs=' ]]; then
local -a user_args=("${makeWrapperArgs[@]}")
else
local -a user_args="($makeWrapperArgs)"
fi
local -a wrapProgramArgs=("${wrap_args[@]}" "${user_args[@]}")
declare -p wrapProgramArgs
}
makeWrapperArgs=
c
makeWrapperArgs=()
c→ set -eux
c() {
if [[ "$(declare -p makeWrapperArgs)" =~ ^'declare -a makeWrapperArgs=' ]]; then
local -a user_args=("${makeWrapperArgs[@]}")
else
local -a user_args="($makeWrapperArgs)"
fi
local -a wrapProgramArgs=("${wrap_args[@]}" "${user_args[@]}")
declare -p wrapProgramArgs
}
makeWrapperArgs=
c
makeWrapperArgs=()
c |
|
Fixed in a6bb2ed, thanks for letting me know. |
This was referenced Jan 5, 2020
Closed
10 tasks
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.
Motivation for this change
When
makeWrapperArgsis a Bash array, we only passed the first item towrapProgram. We need to use"${makeWrapperArgs[@]}"to extract all the items. But that breaks the common string case so we need to handle that case separately.Closes: #76158
Things done
sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)nix path-info -Sbefore and after)cc @worldofpeace