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

xbps-src/chroot.sh: simplify update_base_chroot().

Browse source
This commit is contained in:
Juan RP 2020-01-05 10:25:02 +01:00
parent fde04ae647
commit b2b0409be4
1 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -46,17 +46,15 @@ reconfigure_base_chroot() {
update_base_chroot() { update_base_chroot() {
[ -z "$CHROOT_READY" ] && return [ -z "$CHROOT_READY" ] && return
[ -z "$XBPS_KEEP_ALL" -a -z "$XBPS_SKIP_DEPS" ] && remove_pkg_autodeps
msg_normal "xbps-src: cleaning up $XBPS_MASTERDIR masterdir...\n"
[ -z "$XBPS_KEEP_ALL" ] && rm -rf $XBPS_MASTERDIR/builddir $XBPS_MASTERDIR/destdir
msg_normal "xbps-src: updating software in $XBPS_MASTERDIR masterdir...\n" msg_normal "xbps-src: updating software in $XBPS_MASTERDIR masterdir...\n"
# no need to sync repodata, chroot_sync_repodata() does it for us. # no need to sync repodata, chroot_sync_repodata() does it for us.
if $(${XBPS_INSTALL_CMD} ${XBPS_INSTALL_ARGS} -nu|grep -q xbps); then if $(${XBPS_INSTALL_CMD} ${XBPS_INSTALL_ARGS} -nu|grep -q xbps); then
${XBPS_INSTALL_CMD} ${XBPS_INSTALL_ARGS} -yu xbps || msg_error "xbps-src: failed to update xbps!\n" ${XBPS_INSTALL_CMD} ${XBPS_INSTALL_ARGS} -yu xbps || msg_error "xbps-src: failed to update xbps!\n"
fi fi
${XBPS_INSTALL_CMD} ${XBPS_INSTALL_ARGS} -yu || msg_error "xbps-src: failed to update base-chroot!\n" ${XBPS_INSTALL_CMD} ${XBPS_INSTALL_ARGS} -yu || msg_error "xbps-src: failed to update base-chroot!\n"
[ -z "$XBPS_KEEP_ALL" -a -z "$XBPS_SKIP_DEPS" ] && remove_pkg_autodeps
msg_normal "xbps-src: cleaning up $XBPS_MASTERDIR masterdir...\n" msg_normal "xbps-src: cleaning up $XBPS_MASTERDIR masterdir...\n"
[ -z "$XBPS_KEEP_ALL" -a -z "$XBPS_SKIP_DEPS" ] && remove_pkg_autodeps
[ -z "$XBPS_KEEP_ALL" ] && rm -rf $XBPS_MASTERDIR/builddir $XBPS_MASTERDIR/destdir
} }
# FIXME: $XBPS_FFLAGS is not set when chroot_init() is run # FIXME: $XBPS_FFLAGS is not set when chroot_init() is run