moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

xbps-src: propagate error returned by xbps-src in the chroot.

Browse source 
Rather than pointing the user to cat the .log file, just cat it before exiting.
This commit is contained in:
Juan RP 2010-05-09 19:46:28 +02:00
parent e514b75180
commit 81d6978f02
5 changed files with 73 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

31
xbps-src/libexec/xbps-src-doinst-helper.sh.in
View file

@ -91,8 +91,12 @@ install_src_phase()
set_build_vars
# Run pre_install func.
run_func pre_install 2>${wrksrc}/.xbps_pre_install.log \
|| msg_error "$pkgname: pre_install() failed! check $wrksrc/.xbps_pre_install.log"
run_func pre_install 2>${wrksrc}/.xbps_pre_install.log
if [ $? -ne 0 ]; then
msg_red "$pkgname: pre_install() failed:"
cat $wrksrc/.xbps_pre_install.log
exit 1
fi
msg_normal "Running install phase for $pkgname-$lver."
@ -114,9 +118,12 @@ install_src_phase()
cd ${wrksrc} || msg_error "can't change cwd to wrksrc!"
# Run post_install func.
run_func post_install 2>${wrksrc}/.xbps_post_install.log \
|| msg_error "$pkgname: post_install() failed! check $wrksrc/.xbps_post_install.log"
run_func post_install 2>${wrksrc}/.xbps_post_install.log
if [ $? -ne 0 ]; then
msg_red "$pkgname: post_install() failed:"
cat ${wrksrc}/.xbps_post_install.log
exit 1
fi
unset_build_vars
# Remove libtool archives by default.
@ -163,9 +170,12 @@ install_src_phase()
pkgname=${subpkg}
set_tmpl_common_vars
set_build_vars
run_func do_install \
2>${wrksrc}/.xbps_do_install_${pkgname}.log || \
msg_error "$pkgname: do_install() failed! check $wrksrc/.xbps_do_install_$pkgname.log"
run_func do_install 2>${wrksrc}/.xbps_do_install_${pkgname}.log
if [ $? -ne 0 ]; then
msg_red "$pkgname: do_install() failed:"
cat ${wrksrc}/.xbps_do_install_${pkgname}.log
exit 1
fi
unset_build_vars
done
@ -196,9 +206,8 @@ make_install()
#
# Install package via make.
#
{ ${make_cmd} ${make_install_target} ${make_install_args} \
2>&1 | tee $wrksrc/.xbps_make_install.log; } \
|| msg_error "$pkgname: make install failed! check $wrksrc/.xbps_make_install.log"
${make_cmd} ${make_install_target} ${make_install_args} \
|| msg_error "$pkgname: make install failed!"
}
[ -z "$PKG_TMPLNAME" ] && exit 1