[dak/master] symlinks

[Joerg Jaspert <joerg@debian.org>]

no longer call symlinks in every dinstall run. instead call it once per
week.
Also call it in di-byhand, just to ensure there isnt any symlink going wrong
there.

Signed-off-by: Joerg Jaspert <joerg@debian.org>
---
 config/debian/cron.dinstall |    3 ---
 config/debian/cron.weekly   |    3 +++
 scripts/debian/byhand-di    |    4 ++++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/config/debian/cron.dinstall b/config/debian/cron.dinstall
index 9600183..f7c128f 100755
--- a/config/debian/cron.dinstall
+++ b/config/debian/cron.dinstall
@@ -197,9 +197,6 @@ function accepted() {
 function cruft() {
     log "Checking for cruft in overrides"
     dak check-overrides
-
-    log "Fixing symlinks in $ftpdir"
-    symlinks -d -r $ftpdir
 }
 
 function msfl() {
diff --git a/config/debian/cron.weekly b/config/debian/cron.weekly
index 5ab9d8b..34f0c64 100755
--- a/config/debian/cron.weekly
+++ b/config/debian/cron.weekly
@@ -57,6 +57,9 @@ apt-ftparchive -q clean apt.conf.buildd
 echo "Update wanna-build database dump"
 /org/ftp.debian.org/scripts/nfu/get-w-b-db
 
+echo "Fixing symlinks in $ftpdir"
+symlinks -d -r $ftpdir
+
 echo "Finally, all is done, compressing logfile"
 exec > /dev/null 2>&1
 
diff --git a/scripts/debian/byhand-di b/scripts/debian/byhand-di
index 0a004f3..67db551 100755
--- a/scripts/debian/byhand-di
+++ b/scripts/debian/byhand-di
@@ -95,6 +95,10 @@ mv "$TMPDIR/installer-$ARCH/current"  "$TARGET"
 find "$TARGET/$VERSION" -type d -exec chmod 755 {} +
 find "$TARGET/$VERSION" -type f -exec chmod 644 {} +
 
+# Make sure nothing symlinks outside of the ftpdir
+# Shouldnt happen, but better be sure.
+symlinks -d -r /srv/ftp.debian.org/ftp
+
 trap - EXIT
 cleanup
 
-- 
1.6.3.3