From e2840dbd7b6d00e68389ae99c29912b4c7a7293f Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 21 Oct 2011 11:10:28 +0200 Subject: [PATCH] xbps-src: don't overwrite xbps conf plist files. --- xbps-src/shutils/chroot.sh.in | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/xbps-src/shutils/chroot.sh.in b/xbps-src/shutils/chroot.sh.in index eb9e0a7a2b..01ae95b617 100644 --- a/xbps-src/shutils/chroot.sh.in +++ b/xbps-src/shutils/chroot.sh.in @@ -205,13 +205,15 @@ prepare_binpkg_repos() 0.1[0-9].[0-9]*) mkdir -p ${XBPS_MASTERDIR}/usr/local/etc/xbps for f in /etc /usr/local/etc; do - if [ -d $f/xbps ]; then - cp -f $f/xbps/*.plist \ - ${XBPS_MASTERDIR}/usr/local/etc/xbps - fi + for conf in conf repositories; do + if [ ! -f $XBPS_MASTERDIR/usr/local/etc/xbps/${conf}.plist ]; then + [ -d $f ] && cp -f $f/xbps/${conf}.plist \ + ${XBPS_MASTERDIR}/usr/local/etc/xbps + fi + done done msg_normal "Synchronizing index for remote repositories...\n" - ${XBPS_REPO_CMD} sync + ${XBPS_REPO_CMD} sync 2>/dev/null ;; 0.[89].[0-9]*) CONF_FILE=$XBPS_MASTERDIR/usr/local/etc/xbps-conf.plist