Merge changes from spohr.

diff --git a/ChangeLog b/ChangeLog
index f84478160ad8f20026cf6698b50a022c40e5c277..1cce754897bc0e7d993bdf0307f666739d0adb48 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2006-06-11  James Troup  <troup@spohr.debian.org>
+
+       * config/debian/cron.daily: invoke process-accepted not
+       process-unchecked.
+
+       * config/debian/vars (scriptsdir): new variable.
+       * config/debian/cron.daily: use it.
+
+       * scripts/debian/mkmaintainers: put Maintainers_Versions-non-US in
+       $base/misc/ instead of versioned $masterdir.  Correct 'dak
+       make-maintainers' invocation to look in $configdir for
+       pseudo-packages.maintainers.
+
+       * daklib/queue.py (Upload.do_reject): use correct name for
+       rejection template.
+
 2006-06-11  James Troup  <james@nocrew.org>
 
        * dak/override.py (main): temporarily add content of old X-Katie

diff --git a/config/debian/cron.daily b/config/debian/cron.daily
index 5d85823b471a1d3bc783b1bcd501731f22915f69..292a9afd82a1d915f666cb6058f6915c238ce234 100755 (executable)
--- a/config/debian/cron.daily
+++ b/config/debian/cron.daily
@@ -39,9 +39,10 @@ pg_dump projectb > /org/ftp.debian.org/backup/dump_$(date +%Y.%m.%d-%H:%M:%S)
 ################################################################################
 
 TS=$(($TS+1)); echo Archive maintenance timestamp $TS: $(date +%X)
-update-bugdoctxt
-update-mirrorlists
-update-mailingliststxt
+cd $configdir
+$scriptsdir/update-bugdoctxt
+$scriptsdir/update-mirrorlists
+$scriptsdir/update-mailingliststxt
 
 ################################################################################
 
@@ -49,7 +50,7 @@ TS=$(($TS+1)); echo Archive maintenance timestamp $TS: $(date +%X)
 lockfile $LOCKAC
 cd $accepted
 rm -f REPORT
-dak process-unchecked -pa *.changes | tee REPORT | \
+dak process-accepted -pa *.changes | tee REPORT | \
      mail -s "Install for $(date +%D)" ftpmaster@ftp-master.debian.org
 chgrp debadmin REPORT
 chmod 664 REPORT
@@ -110,11 +111,12 @@ apt-ftparchive generate apt.conf.buildd
 
 TS=$(($TS+1)); echo Archive maintenance timestamp $TS: $(date +%X)
 
-mkmaintainers
-copyoverrides
-mklslar
-mkfilesindices
-mkchecksums
+cd $scriptsdir
+./mkmaintainers
+./copyoverrides
+./mklslar
+./mkfilesindices
+./mkchecksums
 #
 # Fetch bugs information before unchecked processing is allowed again.
 /org/ftp.debian.org/testing/britney bugs
@@ -166,7 +168,8 @@ echo Daily cron scripts successful.
 TS=$(($TS+1)); echo Archive maintenance timestamp $TS: $(date +%X)
 
 # Stats pr0n
-update-ftpstats $base/log/* > $base/misc/ftpstats.data
+cd $configdir
+$scriptsdir/update-ftpstats $base/log/* > $base/misc/ftpstats.data
 R --slave --vanilla < $base/misc/ftpstats.R
 
 TS=$(($TS+1)); echo Archive maintenance timestamp $TS: $(date +%X)

diff --git a/config/debian/vars b/config/debian/vars
index 974ca12ac4c6f5f34627020efdfed01af98f8542..59fd6b31ad2adaab9cb502eb1b05b1625d28915d 100644 (file)
--- a/config/debian/vars
+++ b/config/debian/vars
@@ -9,6 +9,7 @@ archs="alpha amd64 arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sp
 scriptdir=$base/scripts
 masterdir=$base/dak/
 configdir=$base/dak/config/debian/
+scriptsdir=$base/dak/scripts/debian/
 dbdir=$base/database/
 lockdir=$base/lock/
 overridedir=$scriptdir/override

diff --git a/daklib/queue.py b/daklib/queue.py
index 6dc0cd9e96c1cb48985cdcc672e8135efd3e6eaa..3194e19c87bce1321859ec5abc58a530623c1e29 100644 (file)
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -646,7 +646,7 @@ distribution."""
             Subst["__MANUAL_REJECT_MESSAGE__"] = ""
             Subst["__CC__"] = "X-DAK-Rejection: automatic (moo)\nX-Katie-Rejection: automatic (moo)"
             os.write(reason_fd, reject_message)
-            reject_mail_message = utils.TemplateSubst(Subst,Cnf["Dir::Templates"]+"/dak.rejected")
+            reject_mail_message = utils.TemplateSubst(Subst,Cnf["Dir::Templates"]+"/queue.rejected")
         else:
             # Build up the rejection email
             user_email_address = utils.whoami() + " <%s>" % (Cnf["Dinstall::MyAdminAddress"])
@@ -654,7 +654,7 @@ distribution."""
             Subst["__REJECTOR_ADDRESS__"] = user_email_address
             Subst["__MANUAL_REJECT_MESSAGE__"] = reject_message
             Subst["__CC__"] = "Cc: " + Cnf["Dinstall::MyEmailAddress"]
-            reject_mail_message = utils.TemplateSubst(Subst,Cnf["Dir::Templates"]+"/dak.rejected")
+            reject_mail_message = utils.TemplateSubst(Subst,Cnf["Dir::Templates"]+"/queue.rejected")
             # Write the rejection email out as the <foo>.reason file
             os.write(reason_fd, reject_mail_message)
 

diff --git a/scripts/debian/mkfilesindices b/scripts/debian/mkfilesindices
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/scripts/debian/mkmaintainers b/scripts/debian/mkmaintainers
index bf141039546e72d090089562432a9633113b72a1..c914b4c7b5499da44ba8440bea1f333fe7a51e00 100755 (executable)
--- a/scripts/debian/mkmaintainers
+++ b/scripts/debian/mkmaintainers
@@ -5,9 +5,9 @@ echo -n 'Creating Maintainers index ... '
 
 set -e
 . $SCRIPTVARS
-cd $masterdir
+cd $base/misc/
 
-nonusmaint="$masterdir/Maintainers_Versions-non-US"
+nonusmaint="$base/misc/Maintainers_Versions-non-US"
 
 
 if wget -T15 -q -O Maintainers_Versions-non-US.gz http://non-us.debian.org/indices-non-US/Maintainers_Versions.gz; then
@@ -17,7 +17,7 @@ if wget -T15 -q -O Maintainers_Versions-non-US.gz http://non-us.debian.org/indic
 fi
 
 cd $indices
-dak make-maintainers $nonusmaint $masterdir/pseudo-packages.maintainers | sed -e "s/~[^  ]*\([   ]\)/\1/"  | awk '{printf "%-20s ", $1; for (i=2; i<=NF; i++) printf "%s ", $i; printf "\n";}' > .new-maintainers
+dak make-maintainers $nonusmaint $configdir/pseudo-packages.maintainers | sed -e "s/~[^  ]*\([   ]\)/\1/"  | awk '{printf "%-20s ", $1; for (i=2; i<=NF; i++) printf "%s ", $i; printf "\n";}' > .new-maintainers
 
 set +e
 cmp .new-maintainers Maintainers >/dev/null

diff --git a/scripts/debian/update-ftpstats b/scripts/debian/update-ftpstats
old mode 100644 (file)
new mode 100755 (executable)