merge in bugscan fixes

diff --git a/bugreport b/bugreport
index facc662108f9c4497e7394521fba7747dcc11f0b..c8cc82d0388e769893a2549068a183c885ee1c13 100755 (executable)
--- a/bugreport
+++ b/bugreport
@@ -173,7 +173,8 @@ sub FilterPackages($) {
        my $filter = shift;             # Distribution we want to keep
 
        for my $p (sort keys %scanlib::packagelist) {
-               delete $scanlib::packagelist{$p} unless ($scanlib::section{$p} =~ m/^$filter/);
+               delete $scanlib::packagelist{$p} unless (defined $scanlib::section{$p} and
+                                                        $scanlib::section{$p} =~ m/^$filter/);
        }
 }
 

diff --git a/dohtml b/dohtml
index 316d5ee43eda229908648347759395aa66d0cf8b..3e1e04eeb6d43c3ce0282db44f9ebf67184d99c1 100755 (executable)
--- a/dohtml
+++ b/dohtml
@@ -145,8 +145,8 @@ makepage() {
        mv -f $3.new $3
 }
 
-time=$(date -u --date="$(ls -Ll status | awk '{print $6, $7}'):00 $(date +%z)")
-oldtime=$(date -u --date="$(ls -Ll status-old | awk '{print $6, $7}'):00 $(date +%z)")
+time=$(date -u -d '@'$(($(stat -c '%Y' status) / 3600 * 3600)))
+oldtime=$(date -u -d '@'$(($(stat -c '%Y' status-old) / 3600 * 3600)))
 title="Release-critical bugs status"
 
 makepage "debian" "$title" "$htmldir/debian/all.html" "$time"