Merge branch 'master' into lukeshu/xbs

# Conflicts:
#	config
#	cron-jobs/db-cleanup
#	db-check-nonfree
#	db-import-archlinux-any-to-ours
#	db-import-archlinux-pkg
#	db-import-archlinux-src
#	test/lib/common.inc
#	test/test.d/create-filelists.sh
#	test/test.d/db-update.sh
#	test/test.d/testing2x.sh

1 files changed, 2 insertions, 1 deletions

diff --git a/db-update b/db-update
index c55869e..e98320f 100755
--- a/db-update
+++ b/db-update
@@ -9,7 +9,7 @@ if [ $# -ge 1 ]; then
 fi
 
 # Find repos with packages to release
-staging_repos=($(find  "${STAGING}" -mindepth 1 -type f -name "*${PKGEXT}" -printf '%h\n' | sort -u))
+staging_repos=($(find  "${STAGING}" -mindepth 1 -maxdepth 3 -type f -name "*${PKGEXT}" -printf '%h\n' | sort -u))
 if [ $? -ge 1 ]; then
 	die "Could not read %s" "${STAGING}"
 fi
@@ -20,6 +20,7 @@ for staging_repo in "${staging_repos[@]##*/}"; do
 		repos+=("${staging_repo}")
 	fi
 done
+repos=($(echo "${repos[@]}" | tr " " "\n" | sort -u))
 
 # TODO: this might lock too much (architectures)
 for repo in "${repos[@]}"; do