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, 9 insertions, 6 deletions

diff --git a/config b/config
index 79b795c..75eae37 100644
--- a/config
+++ b/config
@@ -1,4 +1,7 @@
 #!/hint/bash
+# Please try to refrain from adding new variables to this file.
+# Instead, create separate ${toolname}.conf files.  Only add a
+# variable here if multiple tools start needing the option.
 
 case "$USER" in
 	db-import-packages) _name=import-packages;;
@@ -8,6 +11,11 @@ esac
 
 FTP_BASE="/srv/repo/main"
 PKGREPOS=()
+# PKGREPOS=(
+# 	'core' 'testing' 'extra' 'community' 'multilib' 'multilib-testing'
+# 	'libre' 'libre-testing' 'libre-multilib' 'libre-multilib-testing'
+# 	'~smv' '~xihh' '~brendan' '~lukeshu' '~emulatorman' '~aurelien' '~jorginho' '~coadde' '~drtan'
+# 	'nonsystemd' 'nonsystemd-testing' 'nonprism' 'nonprism-testing' 'pcr' 'kernels' 'cross' 'java')
 PKGPOOL=''
 SRCPOOL=''
 
@@ -24,11 +32,10 @@ SOURCE_CLEANUP_KEEP=14
 REQUIRE_SIGNATURE=true
 
 LOCK_DELAY=10
-LOCK_TIMEOUT=300
 
 [ -n "${STAGING:-}" ] || STAGING="$HOME/staging/unknown/staging"
 export TMPDIR="${TMPDIR:-/tmp}"
-ARCHES=(i686 x86_64)
+ARCHES=(i686 x86_64 armv7h)
 DBEXT=".db.tar.gz"
 FILESEXT=".files.tar.gz"
 PKGEXT=".pkg.tar.?z"
@@ -42,10 +49,6 @@ SRCEXT=".src.tar.gz"
 LIST="dev@lists.parabola.nu"
 FROM="dbscripts+${_name}@$(hostname -f)"
 
-# Where to send error emails, and who they are from
-LIST="maintenance@lists.parabola.nu"
-FROM="repo@parabola.nu"
-
 # Override default config with config.local
 [ -f "$(dirname "${BASH_SOURCE[0]}")/config.local" ] && . "$(dirname "${BASH_SOURCE[0]}")/config.local"
 [ -f "$(dirname "${BASH_SOURCE[0]}")/config.local.${_name}" ] && . "$(dirname "${BASH_SOURCE[0]}")/config.local.${_name}"