From 4d9ed5639f631f1475c53dcfd9b12087b6baae4a Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 5 May 2014 10:56:00 +0200 Subject: [PATCH] xbps-src/shutils/chroot.sh: unconditionally copy repo conf files into masterdir. --- common/xbps-src/shutils/chroot.sh | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/common/xbps-src/shutils/chroot.sh b/common/xbps-src/shutils/chroot.sh index 925c3e3341..208daaf1f1 100644 --- a/common/xbps-src/shutils/chroot.sh +++ b/common/xbps-src/shutils/chroot.sh @@ -117,14 +117,10 @@ chroot_sync_repos() { install -Dm644 ${XBPS_COMMONDIR}/xbps-src/chroot/xbps.conf \ ${XBPS_MASTERDIR}/etc/xbps/xbps.conf fi - if [ ! -f ${XBPS_MASTERDIR}/etc/xbps/repos/local.conf ]; then - install -Dm644 ${XBPS_COMMONDIR}/xbps-src/chroot/repos-local.conf \ - ${XBPS_MASTERDIR}/etc/xbps/repos/local.conf - fi - if [ ! -f ${XBPS_MASTERDIR}/etc/xbps/repos/remote.conf ]; then - install -Dm644 ${XBPS_COMMONDIR}/xbps-src/chroot/repos-remote.conf \ - ${XBPS_MASTERDIR}/etc/xbps/repos/remote.conf - fi + install -Dm644 ${XBPS_COMMONDIR}/xbps-src/chroot/repos-local.conf \ + ${XBPS_MASTERDIR}/etc/xbps/repos/local.conf + install -Dm644 ${XBPS_COMMONDIR}/xbps-src/chroot/repos-remote.conf \ + ${XBPS_MASTERDIR}/etc/xbps/repos/remote.conf # if -N is set, comment out remote repositories from xbps.conf. if [ -n "$XBPS_SKIP_REMOTEREPOS" ]; then