void/void-packages
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

xbps-src: when installing reqdeps from binpkgs, create logs in /tmp via mktemp.

Browse source
This commit is contained in:
Juan RP 2011-10-14 19:08:56 +02:00
parent ec32b7c1d9
commit 28f7abf0f5
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
xbps-src/shutils/builddep_funcs.sh
View file

@ -30,19 +30,18 @@
# #
install_pkglist_from_repos() install_pkglist_from_repos()
{ {
local cmd rval local cmd rval depstmpf tmplogf
cmd="${fakeroot_cmd} ${fakeroot_cmd_args} ${XBPS_BIN_CMD} -Ay install" cmd="${fakeroot_cmd} ${fakeroot_cmd_args} ${XBPS_BIN_CMD} -Ay install"
msg_normal "$pkgver: installing required dependencies ...\n" msg_normal "$pkgver: installing required dependencies ...\n"
[ -z "${wrksrc}" ] && wrksrc="$XBPS_BUILDDIR/$pkgname"
[ ! -d "${wrksrc}" ] && mkdir -p "${wrksrc}"
depstmpf=$(mktemp) depstmpf=$(mktemp)
for f in ${1}; do for f in ${1}; do
echo "'${f}' " >> $depstmpf echo "'${f}' " >> $depstmpf
done done
${cmd} $(cat $depstmpf) >${wrksrc}/.xbps_install_dependencies.log 2>&1 tmplogf=$(mktemp)
${cmd} $(cat $depstmpf) >$tmplogf 2>&1
rval=$? rval=$?
rm -f $depstmpf rm -f $depstmpf
@ -57,7 +56,7 @@ install_pkglist_from_repos()
# Any other error returned is critical. # Any other error returned is critical.
autoremove_pkg_dependencies $KEEP_AUTODEPS autoremove_pkg_dependencies $KEEP_AUTODEPS
msg_red "$pkgver: failed to install required dependencies! (error $rval)\n" msg_red "$pkgver: failed to install required dependencies! (error $rval)\n"
cat ${wrksrc}/.xbps_install_dependencies.log cat $tmplogf && rm -f $tmplogf
msg_error "Please see above for the real error, exiting...\n" msg_error "Please see above for the real error, exiting...\n"
fi fi
@ -73,12 +72,13 @@ install_pkg_from_repos()
{ {
local cmd rval pkgdepname pkg="$1" local cmd rval pkgdepname pkg="$1"
[ ! -d "${wrksrc}" ] && return 1
pkgdepname=$($XBPS_PKGDB_CMD getpkgdepname "$pkg") pkgdepname=$($XBPS_PKGDB_CMD getpkgdepname "$pkg")
cmd="${fakeroot_cmd} ${fakeroot_cmd_args} ${XBPS_BIN_CMD} -Ay install" cmd="${fakeroot_cmd} ${fakeroot_cmd_args} ${XBPS_BIN_CMD} -Ay install"
msg_normal "$pkgver: installing required dependency '$pkg' ...\n" msg_normal "$pkgver: installing required dependency '$pkg' ...\n"
[ -z "${wrksrc}" ] && wrksrc="$XBPS_BUILDDIR/$pkgname"
[ ! -d "${wrksrc}" ] && mkdir -p "${wrksrc}"
${cmd} "${pkg}" >${wrksrc}/.xbps_install_dependency_${pkgdepname}.log 2>&1 ${cmd} "${pkg}" >${wrksrc}/.xbps_install_dependency_${pkgdepname}.log 2>&1
rval=$? rval=$?
if [ $rval -ne 0 -a $rval -ne 6 ]; then if [ $rval -ne 0 -a $rval -ne 6 ]; then