summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorDave Reisner <dreisner@archlinux.org>2013-04-26 20:32:37 -0400
committerAllan McRae <allan@archlinux.org>2013-04-28 23:11:37 +1000
commitc5a4b35528452855d125cea749fcc4a3a01fca9b (patch)
tree00490646dd7c599fbecce69b5c507ded7c6ca31e /scripts
parentc1dfdd20109bdd154630df9f9d5465e947aa851e (diff)
downloadpacman-c5a4b35528452855d125cea749fcc4a3a01fca9b.tar.xz
makepkg: avoid redirecting stdout
If stdout is already redirected, redirecting stderr to stdout can lead to undesirable results. Fixes FS#34974. Signed-off-by: Dave Reisner <dreisner@archlinux.org> Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/makepkg.sh.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index dfc40772..deddade4 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -1473,7 +1473,7 @@ run_function() {
wait $teepid
rm "$logpipe"
else
- $pkgfunc 2>&1
+ "$pkgfunc"
fi
# reset our shell options
eval "$shellopts"