put our packages in a separate pool

2 files changed, 17 insertions, 11 deletions

diff --git a/config b/config
index 29c42fe..c6efac6 100644
--- a/config
+++ b/config
@@ -12,14 +12,18 @@ USERREPOS=('~smv' '~xihh' '~brendan' '~lukeshu' '~emulatorman' '~aurelien' '~jor
 PROJREPOS=('pcr' 'kernels' 'cross' 'java' 'java-ugly' 'nonprism')
 # Remote repos
 PKGREPOS=("${ARCHREPOS[@]}" "${OURREPOS[@]}" "${USERREPOS[@]}" "${PROJREPOS[@]}")
-PKGPOOL='pool/packages'
-SRCPOOL='sources/packages'
+PKGPOOL='pool/parabola'
+SRCPOOL='sources/parabola'
 
 # Directories where packages are shared between repos
 # *relative to FTP_BASE*
-PKGPOOLS=('pool/packages' 'pool/community')
+ARCHPKGPOOLS=(pool/{packages,community})
+OURPKGPOOLS=(pool/parabola)
+PKGPOOLS=(${OURPKGPOOLS[@]} ${ARCHPKGPOOLS[@]})
 # Directories where sources are stored
-SRCPOOLS=('sources/packages' 'sources/community')
+ARCHSRCPOOLS=(sources/{packages,community})
+OURPKGPOOLS=(sources/parabola)
+SRCPOOLS=(${OURSRCPOOLS[@]} ${ARCHSRCPOOLS[@]})
 
 CLEANUP_DESTDIR="$FTP_BASE/old/packages"
 CLEANUP_DRYRUN=false
diff --git a/db-sync b/db-sync
index 58bb465..4e692e9 100755
--- a/db-sync
+++ b/db-sync
@@ -143,14 +143,15 @@ init() {
 	# Sync
 	# *Don't delete-after*, this is the job of cleanup scripts. It will remove our
 	# packages too
-	for PKGPOOL in ${PKGPOOLS[@]}; do
+	local pkgpool
+	for pkgpool in ${ARCHPKGPOOLS[@]}; do
 		rsync ${extra} --no-motd -rtlH \
 			--delay-updates \
 			--safe-links \
 			--include-from=/tmp/any.whitelist \
 			--exclude="*" \
-			rsync://${mirror}/${mirrorpath}/${PKGPOOL}/ \
-			${FTP_BASE}/${PKGPOOL}/
+			rsync://${mirror}/${mirrorpath}/${pkgpool}/ \
+			${FTP_BASE}/${pkgpool}/
 	done
 
 	# Sync sources
@@ -161,14 +162,15 @@ init() {
 	# Sync
 	# *Don't delete-after*, this is the job of cleanup scripts. It will remove our
 	# packages too
-	for SRCPOOL in ${SRCPOOLS[@]}; do
+	local srcpool
+	for srcpool in ${ARCHSRCPOOLS[@]}; do
 		rsync ${extra} --no-motd -rtlH \
 			--delay-updates \
 			--safe-links \
 			--include-from=/tmp/any.whitelist \
 			--exclude="*" \
-			rsync://${mirror}/${mirrorpath}/${SRCPOOL}/ \
-			${FTP_BASE}/${SRCPOOL}/
+			rsync://${mirror}/${mirrorpath}/${srcpool}/ \
+			${FTP_BASE}/${srcpool}/
 	done
 
 	# Cleanup
@@ -188,7 +190,7 @@ source "$(dirname "$(readlink -e "$0")")/local_config"
 source "$(dirname "$(readlink -e "$0")")/libremessages"
 
 # Check variables presence
-for var in DBEXT FILESEXT mirror mirrorpath WORKDIR BLACKLIST_FILE FTP_BASE SRCPOOLS PKGPOOLS; do
+for var in DBEXT FILESEXT mirror mirrorpath WORKDIR BLACKLIST_FILE FTP_BASE ARCHSRCPOOLS ARCHPKGPOOLS; do
 
 	test -z "${!var}" && fatal_error "Empty ${var}"
 done