xbps-src: do not ignore EEXIST rval from xbps-install(1).
Due to -I it cannot return EEXIST, and this error value shall be treated as a real error. Does not change the current behaviour but will do if we drop -I.
This commit is contained in:
parent
b2f10b76cf
commit
b52aae3114
1 changed files with 3 additions and 4 deletions
|
@ -65,7 +65,7 @@ setup_pkg_depends() {
|
||||||
|
|
||||||
# Install a required package dependency, like:
|
# Install a required package dependency, like:
|
||||||
#
|
#
|
||||||
# xbps-install -Ay <pkgname>
|
# xbps-install -IAy <pkgname>
|
||||||
#
|
#
|
||||||
# Returns 0 if package already installed or installed successfully.
|
# Returns 0 if package already installed or installed successfully.
|
||||||
# Any other error number otherwise.
|
# Any other error number otherwise.
|
||||||
|
@ -93,7 +93,7 @@ install_pkg_from_repos() {
|
||||||
# ENOTSUP (95): no repositories registered.
|
# ENOTSUP (95): no repositories registered.
|
||||||
#
|
#
|
||||||
case "$rval" in
|
case "$rval" in
|
||||||
0|17) # success, check if there are errors.
|
0) # success, check if there are errors.
|
||||||
errortmpf=$(mktemp) || exit 1
|
errortmpf=$(mktemp) || exit 1
|
||||||
grep ^ERROR $tmplogf > $errortmpf
|
grep ^ERROR $tmplogf > $errortmpf
|
||||||
[ -s $errortmpf ] && cat $errortmpf
|
[ -s $errortmpf ] && cat $errortmpf
|
||||||
|
@ -107,8 +107,7 @@ install_pkg_from_repos() {
|
||||||
msg_error "Please see above for the real error, exiting...\n"
|
msg_error "Please see above for the real error, exiting...\n"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
[ $rval -eq 17 ] && rval=0
|
rm -f $tmplogf
|
||||||
rm -f $logtmpf
|
|
||||||
return $rval
|
return $rval
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue