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

xbps-src: require xbps>=0.54.

Browse source 
if xbps-install(1) returns EEXIST, treat it as an error,
do not ignore it.

xbps-install(1) now returns only EEXIST for file conflicts
in transaction, so that it should not be ignored.
This commit is contained in:
Juan RP 2019-06-21 11:47:15 +02:00
parent 0e46d29f44
commit 198acb8e39
No known key found for this signature in database
GPG key ID: AF19F6CB482F9368
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -82,15 +82,17 @@ install_pkg_from_repos() {
$XBPS_INSTALL_CMD -Ayd "$pkg" >$tmplogf 2>&1
fi
rval=$?
if [ $rval -ne 0 -a $rval -ne 17 ]; then
if [ $rval -ne 0 ]; then
# xbps-install can return:
#
# SUCCESS (0): package installed successfully.
# ENOENT (2): package missing in repositories.
# ENXIO (6): package depends on invalid dependencies.
# EAGAIN (11): package conflicts.
# EEXIST (17): package already installed.
# ENODEV (19): package depends on missing dependencies.
# ENOEXEC (8): unresolved shlibs in transaction.
# EAGAIN (11): conflicting packages in transaction.
# ENOMEM (12): out of memory.
# EEXIST (17): conflicting files in transaction.
# ENODEV (19): broken reverse dependencies in transaction.
# ENOTSUP (95): no repositories registered.
#
[ -z "$XBPS_KEEP_ALL" ] && remove_pkg_autodeps
@ -98,7 +100,6 @@ install_pkg_from_repos() {
cat $tmplogf
msg_error "Please see above for the real error, exiting...\n"
fi
[ $rval -eq 17 ] && rval=0
return $rval
}

2
xbps-src
View file

@ -390,7 +390,7 @@ setup_distfiles_mirror() {
done
}
readonly XBPS_VERSION_REQ="0.46"
readonly XBPS_VERSION_REQ="0.54"
readonly XBPS_VERSION=$(xbps-uhelper -V|awk '{print $2}')
readonly XBPS_SRC_VERSION="113"
export XBPS_MACHINE=$(xbps-uhelper arch)