diff options
| author | Kevin Locke <kevin@kevinlocke.name> | 2017-02-27 00:22:46 -0700 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2017-04-19 08:00:13 +0200 |
| commit | a03af0d14e9b57e1650966806c5f6ba3ac943609 (patch) | |
| tree | 694edb3669820b59d27fa6851c3def2e243166c1 | |
| parent | 9fa917a19b6a844e68a3f2d50cb2b82bbc2f2ac7 (diff) | |
git-pbuilder: Check $OPTIONS for --basepath
Previously only the arguments were checked for --basepath. This
resulted in --basepath being ignored and overridden by the default when
passed in --git-pbuilder-options (either via command arguments or from
the configuration file). Since this is required when invoking
gbp-buildpackage (because args are passed to --debbuildopts), it's a
significant use case. This commit fixes the issue by searching both
args and $OPTIONS.
Closes: #856263
Signed-off-by: Kevin Locke <kevin@kevinlocke.name>
| -rw-r--r-- | bin/git-pbuilder | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/git-pbuilder b/bin/git-pbuilder index a3bd2824..30100ce3 100644 --- a/bin/git-pbuilder +++ b/bin/git-pbuilder @@ -160,7 +160,7 @@ if [ no != "$GIT_PBUILDER_AUTOCONF" ]; then # that and that alone, since if it's specified more than once, # cowbuilder will fail. bp_found="" - for opt in $@; do + for opt in "$@" "${OPTIONS[@]}"; do case $opt in --basepath|--basepath=*) bp_found="yes" ;; esac |