diff options
| author | Eli Schwartz <eschwartz@archlinux.org> | 2018-08-29 07:10:21 +0200 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2018-08-29 08:00:01 +0200 |
| commit | 5b2ff51c399a906fd70df62ca179e2a696ea3860 (patch) | |
| tree | 66e4bb04866aea229980b5e8d66f1f9f51046050 | |
| parent | 16f6aae33087ec04c1dc90aa84f7d3dde4333046 (diff) | |
| download | pacman-5b2ff51c399a906fd70df62ca179e2a696ea3860.tar.gz pacman-5b2ff51c399a906fd70df62ca179e2a696ea3860.tar.xz | |
makepkg: don't print status for run_function when in a subshell
It's most likely a case where output is being captured, so we shouldn't
be interleaving status messages with function output regardless. Setting
the pkgver() status message (the one time we use it in a subshell)
separately also makes it safe to change whether message.sh functions write
to stdout or stderr.
Signed-off-by: Eli Schwartz <eschwartz@archlinux.org>
Signed-off-by: Allan McRae <allan@archlinux.org>
| -rw-r--r-- | scripts/makepkg.sh.in | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 4e8f9dc3..89a31148 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -187,6 +187,7 @@ enter_fakeroot() { # Automatically update pkgver variable if a pkgver() function is provided # Re-sources the PKGBUILD afterwards to allow for other variables that use $pkgver update_pkgver() { + msg "$(gettext "Starting %s()...")" "pkgver" newpkgver=$(run_function_safe pkgver) if (( $? != 0 )); then error_function pkgver @@ -447,7 +448,9 @@ run_function() { fi local pkgfunc="$1" - msg "$(gettext "Starting %s()...")" "$pkgfunc" + if (( ! BASH_SUBSHELL )); then + msg "$(gettext "Starting %s()...")" "$pkgfunc" + fi cd_safe "$srcdir" local ret=0 |