diff options
author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-04-17 15:41:37 -0400 |
---|---|---|
committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-04-17 15:41:37 -0400 |
commit | da0737360ab185844e4461d7580cf81c639e9ded (patch) | |
tree | afdc2387e43645a62410852d96fa0cf549363597 /config | |
parent | 0b96686ab36ddc29e07281d52dd7790c5c5ca89d (diff) | |
parent | 9705ba8a148d03dfd4c2184f3a1f13ee373eb826 (diff) |
Merge branch 'lukeshu/archlinux+cleanup+librelib' into lukeshu/xbs
# Conflicts:
# config
# cron-jobs/makepkg.conf
# cron-jobs/update-web-db
# db-functions
# db-move
# db-remove
# db-update
# test/lib/common.inc
# test/test.d/create-filelists.sh
# test/test.d/db-update.sh
# testing2x
Diffstat (limited to 'config')
-rw-r--r-- | config | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -42,6 +42,10 @@ 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}" |