diff options
| author | Eli Schwartz <eschwartz@archlinux.org> | 2018-06-03 01:31:17 -0400 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2018-06-18 13:15:51 +1000 |
| commit | ab1e92860bdc5388621e8314b8e1652590fa2b05 (patch) | |
| tree | e7e65e799d7a6024ab94f4ebe77d3ed710558876 /scripts | |
| parent | b37a6063d0d37eb16465693439e3dfb92409e44a (diff) | |
| download | pacman-ab1e92860bdc5388621e8314b8e1652590fa2b05.tar.xz | |
makepkg: fix the --nocolor option being broken when passed to pacman -U
In commit 8ff03868a37b1f9c447784ae2fd639a49e426399 PACMAN_OPTS was
turned into an array. Unfortunately, that array was generated by
treating the "--color never" option as one string, instead of an
array of two strings...
Fixes FS#58820
Signed-off-by: Eli Schwartz <eschwartz@archlinux.org>
Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/makepkg.sh.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 14f81692..43ccb121 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1265,7 +1265,7 @@ while true; do -i|--install) INSTALL=1 ;; --key) shift; GPGKEY=$1 ;; -L|--log) LOGGING=1 ;; - -m|--nocolor) USE_COLOR='n'; PACMAN_OPTS+=("--color never") ;; + -m|--nocolor) USE_COLOR='n'; PACMAN_OPTS+=("--color" "never") ;; --noarchive) NOARCHIVE=1 ;; --nocheck) RUN_CHECK='n' ;; --noprepare) RUN_PREPARE='n' ;; |