Merge branch 'master' of /org/buildd.debian.org/git/wanna-build

diff --git a/bin/WannaBuild.pm b/bin/WannaBuild.pm
index 300eb129b94d383d7067589874dda808cfb03cbc..d9433e20058790a73a55a4b07fe80cb16f991dcd 100644 (file)
--- a/bin/WannaBuild.pm
+++ b/bin/WannaBuild.pm
@@ -181,18 +181,26 @@ sub parse_date {
        my $text = shift;
 
        return 0 if !$text;
-       die "Cannot parse date: $text\n"
-               if $text !~ /^(\d{4}) (\w{3}) (\d+) (\d{2}):(\d{2}):(\d{2})$/;
-       my ($year, $mon, $day, $hour, $min, $sec) = ($1, $2, $3, $4, $5, $6);
-       $mon =~ y/A-Z/a-z/;
-       die "Invalid month name $mon" if !exists $monname{$mon};
-       $mon = $monname{$mon};
-       return timegm($sec, $min, $hour, $day, $mon, $year);
+
+       if ($text =~ /^(\d{4}) (\w{3}) (\d+) (\d{2}):(\d{2}):(\d{2})$/) {
+               my ($year, $mon, $day, $hour, $min, $sec) = ($1, $2, $3, $4, $5, $6);
+               $mon =~ y/A-Z/a-z/;
+               die "Invalid month name $mon" if !exists $monname{$mon};
+               $mon = $monname{$mon};
+               return timegm($sec, $min, $hour, $day, $mon, $year);
+       } elsif ($text =~ /^(\d{4})-(\d{2})-(\d{2}) (\d{2}):(\d{2}):(\d{2})(?:\.\d+)?$/) {
+               my ($year, $mon, $day, $hour, $min, $sec) = ($1, $2-1, $3, $4, $5, $6);
+               return timegm($sec, $min, $hour, $day, $mon, $year);
+       } else {
+               die "Cannot parse date: $text\n";
+       }
 }
 
 sub isin {
        my $val = shift;
 
+       return 0 if !$val;
+
        return grep( $_ eq $val, @_ );
 }
 

diff --git a/etc/cron/crontab b/etc/cron/crontab
index b1b9f104967fc46767dd2927a199cfdb9d258a13..017ccf4c322de1fae691ddbe3be7fc357541d67e 100644 (file)
--- a/etc/cron/crontab
+++ b/etc/cron/crontab
@@ -9,15 +9,9 @@
 MAILTO=cron-errors@buildd.debian.org
 43 * * * *       /org/buildd.debian.org/bin/wb-export
 
-MAILTO=adeodato@buildd.debian.org
-# TODO: locking
-#30 3,9,15,21 * * *     /home/adeodato/bin/wannab-import -q ftp
-#7/30 * * * *           /home/adeodato/bin/wannab-import -q status; /home/adeodato/code/tools/scripts/tt -q genweb
-MAILTO=cron-errors@buildd.debian.org
-
 3  0 * * *       make -sC /org/wanna-build/etc/cron check
 
 4  0 * * *       /org/buildd.debian.org/mbox/fix-up-permissions
 
-*/15 * * * *   TZ=UTC /org/buildd.debian.org/web/status/mkstats
+*/15 * * * *   TZ=UTC /org/buildd.debian.org/web/status/mkstats.aba