X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=cron.daily-non-US;h=a901f6b80fe560c18e53c4bcc812a87f1aa78a35;hb=9540d873fa78598454af57f5f8a4875969ed0439;hp=77b5626fa2c1ab180e74259e084006c04e7b4f9a;hpb=9958d0c2f3529d94446846e2e0757d536219ec7b;p=dak.git

diff --git a/cron.daily-non-US b/cron.daily-non-US
index 77b5626f..a901f6b8 100755
--- a/cron.daily-non-US
+++ b/cron.daily-non-US
@@ -37,22 +37,22 @@ update-readmenonus
 
 ################################################################################
 
-cd $incoming
-rm -f REPORT
-katie -pak *.changes | direport | tee REPORT | \
+if [ ! -z "$(find "$accepted" -name \*.changes -maxdepth 1 -mindepth 1)" ]; then
+  cd $accepted
+  rm -f REPORT
+  kelly -pa *.changes | tee REPORT | \
      mail -s "Non-US Install for $(date +%D)" ftpmaster@ftp-master.debian.org
-chgrp debadmin REPORT
-chmod 664 REPORT
+  chgrp debadmin REPORT
+  chmod 664 REPORT
+else
+  echo "kelly: Nothing to install."
+fi
 
 cd $masterdir
 symlinks -d -r $ftpdir
 
 cd $masterdir
 jenna
-# FIXME
-cd /org/non-us.debian.org/database/dists/
-rm -f proposed-updates_-_all.list
-for i in proposed-updates_-_binary-* proposed-updates_-_source.list; do cat $i >> proposed-updates_-_all.list; done
 
 # Generate override files
 cd $overridedir
@@ -69,12 +69,20 @@ ziyi
 
 # Clean out old packages
 rhona
+shania
 
+# Generate the Maintainers file
 cd $indices
-charisma > .new-maintainers
+charisma > .new-maintainers_versions
+mv -f .new-maintainers_versions Maintainers_Versions
+sed -e "s/~[^  ]*\([   ]\)/\1/" < Maintainers_Versions | awk '{printf "%-20s ", $1; for (i=2; i<=NF; i++) printf "%s ", $i; printf "\n";}' > .new-maintainers
 mv -f .new-maintainers Maintainers
 gzip -9v <Maintainers >.new-maintainers.gz
 mv -f .new-maintainers.gz Maintainers.gz
+gzip -9v <Maintainers_Versions >.new-maintainers_versions.gz
+mv -f .new-maintainers_versions.gz Maintainers_Versions.gz
+rm -f Maintainers_Versions
+
 cd $masterdir
 copyoverrides
 mklslar
@@ -95,6 +103,12 @@ echo "VACUUM; VACUUM ANALYZE;" | psql projectb 2>&1 | grep -v "^NOTICE:  Skippin
 
 ################################################################################
 
+# Send a report on NEW/BYHAND packages
+helena | mail -e -s "[non-US] NEW and BYHAND on $(date +%D)" ftpmaster@ftp-master.debian.org
+# and one on crufty packages
+rene | mail -e -s "[non-US] rene run for $(date +%D)" ftpmaster@ftp-master.debian.org
+
+################################################################################
 ulimit -m 90000 -d 90000 -s 10000 -v 90000
 
 run-parts --report /org/non-us.debian.org/scripts/distmnt