moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-12-23 00:08:50 -05:00
Code Issues Releases Wiki Activity

Revert "makepkg: Exit on failure within build() or package() functions"

Browse Source 
As reported in FS#15210, we have some problems with split packages and
variable overrides because of this patch. For now, in prep for a release, it
is best to back it out and see what we can do later.

This reverts commit 621aa26e26.

Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Dan McGee 2009-07-26 12:58:02 -05:00
parent 6fa5f2075a
commit 597118ddd7
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/makepkg.sh.in
View File

@ -718,10 +718,8 @@ run_build() {
build 2>&1 | tee "$BUILDLOG"; ret=${PIPESTATUS[0]} build 2>&1 | tee "$BUILDLOG"; ret=${PIPESTATUS[0]}
else else
# piping to cat ensures makepkg fails on any build error build 2>&1 || ret=$?
build 2>&1 | cat -; ret=${PIPESTATUS[0]}
fi fi
# reset our shell options # reset our shell options
eval "$shellopts" eval "$shellopts"
@ -774,12 +772,12 @@ run_package() {
exec 3>&1 exec 3>&1
tee "$BUILDLOG" < "$logpipe" & tee "$BUILDLOG" < "$logpipe" &
exec 1>"$logpipe" 2>"$logpipe" exec 1>"$logpipe" 2>"$logpipe"
$pkgfunc 2>&1 | cat -; ret=${PIPESTATUS[0]} $pkgfunc 2>&1 || ret=$?
sync sync
exec 1>&3 2>&3 3>&- exec 1>&3 2>&3 3>&-
rm "$logpipe" rm "$logpipe"
else else
$pkgfunc 2>&1 | cat -; ret=${PIPESTATUS[0]} $pkgfunc 2>&1 || ret=$?
fi fi
if [ $ret -gt 0 ]; then if [ $ret -gt 0 ]; then