From d778cbdc70b5653bfcb023e63a3d22b24df9ea4c Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 21 Jun 2019 13:04:43 +0200 Subject: [PATCH] Revert "xbps-src: require xbps>=0.54." This reverts commit 198acb8e39c317a88dab5293b7ccf2037d24e2aa. I'm reverting this until I fix the issue properly. --- common/xbps-src/shutils/build_dependencies.sh | 11 +++++------ xbps-src | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/common/xbps-src/shutils/build_dependencies.sh b/common/xbps-src/shutils/build_dependencies.sh index 40c772e0094..55a8ee635cd 100644 --- a/common/xbps-src/shutils/build_dependencies.sh +++ b/common/xbps-src/shutils/build_dependencies.sh @@ -82,17 +82,15 @@ install_pkg_from_repos() { $XBPS_INSTALL_CMD -Ayd "$pkg" >$tmplogf 2>&1 fi rval=$? - if [ $rval -ne 0 ]; then + if [ $rval -ne 0 -a $rval -ne 17 ]; then # xbps-install can return: # # SUCCESS (0): package installed successfully. # ENOENT (2): package missing in repositories. # ENXIO (6): package depends on invalid 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. + # EAGAIN (11): package conflicts. + # EEXIST (17): package already installed. + # ENODEV (19): package depends on missing dependencies. # ENOTSUP (95): no repositories registered. # [ -z "$XBPS_KEEP_ALL" ] && remove_pkg_autodeps @@ -100,6 +98,7 @@ 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 abb3370e81d..00daec93ce9 100755 --- a/xbps-src +++ b/xbps-src @@ -390,7 +390,7 @@ setup_distfiles_mirror() { done } -readonly XBPS_VERSION_REQ="0.54" +readonly XBPS_VERSION_REQ="0.46" readonly XBPS_VERSION=$(xbps-uhelper -V|awk '{print $2}') readonly XBPS_SRC_VERSION="113" export XBPS_MACHINE=$(xbps-uhelper arch)