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

xbps-src: print detected file conflicts.

Browse source
This commit is contained in:
Juan RP 2019-06-21 18:46:14 +02:00
parent 2aabce9f36
commit e2f098b972
No known key found for this signature in database
GPG key ID: AF19F6CB482F9368
1 changed files with 28 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

46
common/xbps-src/shutils/build_dependencies.sh
View file

@ -77,28 +77,38 @@ install_pkg_from_repos() {
tmplogf=${XBPS_STATEDIR}/xbps_${XBPS_TARGET_MACHINE}_bdep_${pkg}.log tmplogf=${XBPS_STATEDIR}/xbps_${XBPS_TARGET_MACHINE}_bdep_${pkg}.log
if [ -n "$cross" ]; then if [ -n "$cross" ]; then
$XBPS_INSTALL_XCMD -IAyd "$pkg" >$tmplogf 2>&1 $XBPS_INSTALL_XCMD -IAy "$pkg" >$tmplogf 2>&1
else else
$XBPS_INSTALL_CMD -IAyd "$pkg" >$tmplogf 2>&1 $XBPS_INSTALL_CMD -IAy "$pkg" >$tmplogf 2>&1
fi fi
rval=$? rval=$?
if [ $rval -ne 0 -a $rval -ne 17 ]; then # xbps-install can return:
# xbps-install can return: #
# # SUCCESS (0): package installed successfully.
# SUCCESS (0): package installed successfully. # ENOENT (2): package missing in repositories.
# ENOENT (2): package missing in repositories. # ENXIO (6): package depends on invalid dependencies.
# ENXIO (6): package depends on invalid dependencies. # EAGAIN (11): package conflicts.
# EAGAIN (11): package conflicts. # EEXIST (17): file conflicts in transaction (XBPS_FLAG_IGNORE_FILE_CONFLICTS unset)
# EEXIST (17): file conflicts in transaction. # ENODEV (19): package depends on missing dependencies.
# ENODEV (19): package depends on missing dependencies. # ENOTSUP (95): no repositories registered.
# ENOTSUP (95): no repositories registered. #
# case "$rval" in
[ -z "$XBPS_KEEP_ALL" ] && remove_pkg_autodeps 0|17) # success, check if there are errors.
msg_red "$pkgver: failed to install '$1' dependency! (error $rval)\n" errortmpf=$(mktemp) || exit 1
cat $tmplogf grep ^ERROR $tmplogf > $errortmpf
msg_error "Please see above for the real error, exiting...\n" [ -s $errortmpf ] && cat $errortmpf
fi rm -f $errortmpf
;;
*)
[ -z "$XBPS_KEEP_ALL" ] && remove_pkg_autodeps
msg_red "$pkgver: failed to install '$1' dependency! (error $rval)\n"
cat $tmplogf
rm -f $tmplogf
msg_error "Please see above for the real error, exiting...\n"
;;
esac
[ $rval -eq 17 ] && rval=0 [ $rval -eq 17 ] && rval=0
rm -f $logtmpf
return $rval return $rval
} }