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

xbps-src: fix previous.

Browse source
This commit is contained in:
Juan RP 2015-03-09 09:52:35 +01:00
parent c74c204a6e
commit 87d91f0594
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
common/xbps-src/shutils/chroot.sh
View file

@ -143,15 +143,17 @@ chroot_sync_repos() {
rm -f $XBPS_MASTERDIR/usr/$XBPS_CROSS_TRIPLET/etc/xbps.d/*-x86_64.conf rm -f $XBPS_MASTERDIR/usr/$XBPS_CROSS_TRIPLET/etc/xbps.d/*-x86_64.conf
fi fi
# Make sure to sync index for remote repositories. if [ -z "$XBPS_SKIP_REMOTEREPOS" ]; then
if command -v xbps-uunshare &>/dev/null; then # Make sure to sync index for remote repositories.
xbps-uunshare $XBPS_MASTERDIR /usr/sbin/xbps-install -S if command -v xbps-uunshare &>/dev/null; then
if [ $? -eq 99 ]; then xbps-uunshare $XBPS_MASTERDIR /usr/sbin/xbps-install -S
# userns not supported, fallback to uchroot if [ $? -eq 99 ]; then
# userns not supported, fallback to uchroot
xbps-uchroot $XBPS_MASTERDIR /usr/sbin/xbps-install -S
fi
else
xbps-uchroot $XBPS_MASTERDIR /usr/sbin/xbps-install -S xbps-uchroot $XBPS_MASTERDIR /usr/sbin/xbps-install -S
fi fi
else
xbps-uchroot $XBPS_MASTERDIR /usr/sbin/xbps-install -S
fi fi
if [ -n "$XBPS_CROSS_BUILD" ]; then if [ -n "$XBPS_CROSS_BUILD" ]; then
@ -198,9 +200,7 @@ chroot_handler() {
fetch|extract|build|configure|install|install-destdir|pkg|build-pkg|bootstrap-update|chroot) fetch|extract|build|configure|install|install-destdir|pkg|build-pkg|bootstrap-update|chroot)
chroot_prepare || return $? chroot_prepare || return $?
chroot_init || return $? chroot_init || return $?
if [ -z "$XBPS_SKIP_REMOTEREPOS" ]; then chroot_sync_repos || return $?
chroot_sync_repos || return $?
fi
;; ;;
esac esac