From 198acb8e39c317a88dab5293b7ccf2037d24e2aa Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Fri, 21 Jun 2019 11:47:15 +0200
Subject: [PATCH] xbps-src: require xbps>=0.54.

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.
---
 common/xbps-src/shutils/build_dependencies.sh | 11 ++++++-----
 xbps-src                                      |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/common/xbps-src/shutils/build_dependencies.sh b/common/xbps-src/shutils/build_dependencies.sh
index 55a8ee635c..40c772e009 100644
--- a/common/xbps-src/shutils/build_dependencies.sh
+++ b/common/xbps-src/shutils/build_dependencies.sh
@@ -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
 }
 
diff --git a/xbps-src b/xbps-src
index 00daec93ce..abb3370e81 100755
--- a/xbps-src
+++ b/xbps-src
@@ -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)