Merge remote branch 'twerner/msfl' into merge

* twerner/msfl:
  add threadpool implementation
  improve multithread robustness

Signed-off-by: Joerg Jaspert <joerg@debian.org>

diff --git a/COPYING-PSF b/COPYING-PSF
index 5998dbf659bc01112ea55790e9a67ce2cf38bdba..f0ccf47eb448e5620cbd0fb1eccb2e4e10d4db46 100644 (file)
--- a/COPYING-PSF
+++ b/COPYING-PSF
@@ -94,7 +94,7 @@ prepare derivative works, distribute, and otherwise use Python
 alone or in any derivative version, provided, however, that PSF's
 License Agreement and PSF's notice of copyright, i.e., "Copyright (c)
 2001, 2002, 2003, 2004, 2005, 2006 Python Software Foundation; All Rights
-Reserved" are retained in Python alone or in any derivative version 
+Reserved" are retained in Python alone or in any derivative version
 prepared by Licensee.
 
 3. In the event Licensee prepares a derivative work that is based on

diff --git a/config/debian/cron.weekly b/config/debian/cron.weekly
index 6894e0b19d7aafdc89bf6b3c23160682255d40fb..7bc47449287ff59752c9462bdd73bca1d9254045 100755 (executable)
--- a/config/debian/cron.weekly
+++ b/config/debian/cron.weekly
@@ -40,7 +40,7 @@ echo "VACUUM; VACUUM ANALYZE;" | psql --no-psqlrc projectb 2>&1
 
 # Do git cleanup stuff
 echo "Doing git stuff"
-cd /srv/ftp-master.debian.org/git/dak.git
+cd /srv/ftp.debian.org/git/dak.git
 git gc --prune
 git update-server-info
 # now workaround a git bug not honoring the setup in logs/*
@@ -55,7 +55,7 @@ apt-ftparchive -q clean apt.conf.buildd
 
 # Update wanna-build dump
 echo "Update wanna-build database dump"
-/srv/ftp-master.debian.org/scripts/nfu/get-w-b-db
+$base/dak/scripts/nfu/get-w-b-db
 
 echo "Fixing symlinks in $ftpdir"
 symlinks -d -r $ftpdir