+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
################################################################################
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
################################################################################
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
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
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)
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
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"])
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)
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
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