X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fcron.dinstall;h=5a8f107369033db0d660daecbd412a65daddd082;hb=4bb2307cd0c04e14ab7e414b5cdfbb5b2a6d0b46;hp=bb327041a30b697408d52f9eb6039f889ee451c0;hpb=1c2f6a140859239486d697caa26fbd6c6155e936;p=dak.git

diff --git a/config/debian/cron.dinstall b/config/debian/cron.dinstall
index bb327041..5a8f1073 100755
--- a/config/debian/cron.dinstall
+++ b/config/debian/cron.dinstall
@@ -212,7 +212,7 @@ function fingerprints() {
     dak import-keyring -L /srv/keyring.debian.org/keyrings/debian-keyring.gpg
 
     OUTFILE=$(mktemp)
-    dak import-keyring --generate-users /srv/keyring.debian.org/keyrings/debian-maintainers.gpg >"${OUTFILE}"
+    dak import-keyring --generate-users "%s" /srv/keyring.debian.org/keyrings/debian-maintainers.gpg >"${OUTFILE}"
 
     if [ -s "${OUTFILE}" ]; then
         /usr/sbin/sendmail -odq -oi -t -f envelope@ftp-master.debian.org <<EOF
@@ -429,14 +429,14 @@ function maillogfile() {
 function renamelogfile() {
     if [ -f "${dbdir}/dinstallstart" ]; then
         NOW=$(cat "${dbdir}/dinstallstart")
-        maillogfile
+#        maillogfile
         mv "$LOGFILE" "$logdir/dinstall_${NOW}.log"
         logstats "$logdir/dinstall_${NOW}.log"
         bzip2 -9 "$logdir/dinstall_${NOW}.log"
     else
         error "Problem, I don't know when dinstall started, unable to do log statistics."
         NOW=`date "+%Y.%m.%d-%H:%M:%S"`
-        maillogfile
+#        maillogfile
         mv "$LOGFILE" "$logdir/dinstall_${NOW}.log"
         bzip2 -9 "$logdir/dinstall_${NOW}.log"
     fi
@@ -478,7 +478,7 @@ function stage() {
     ARGS='GO[@]'
     local "${!ARGS}"
 
-    error=${ERR:-"false"}
+    error=${ERR:-"true"}
 
     STAGEFILE="${stagedir}/${FUNC}"
     if [ -f "${STAGEFILE}" ]; then