From ad72f1e1665102eb4dfd402fc97b6f45090e9564 Mon Sep 17 00:00:00 2001 From: Don Armstrong Date: Thu, 14 Jun 2007 19:33:02 +0100 Subject: [PATCH] * Don't show time to archive for archived bugs * Handle summary being passed; guess log based on it. --- Debbugs/Status.pm | 3 +++ cgi/pkgreport.cgi | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Debbugs/Status.pm b/Debbugs/Status.pm index bda64abd..312beaca 100644 --- a/Debbugs/Status.pm +++ b/Debbugs/Status.pm @@ -172,6 +172,8 @@ sub read_bug{ } else { $status = $param{summary}; + $log = $status; + $log =~ s/\.summary$/.log/; } my $status_fh = new IO::File $status, 'r' or warn "Unable to open $status for reading: $!" and return undef; @@ -220,6 +222,7 @@ sub read_bug{ } # Add log last modified time $data{log_modified} = (stat($log))[9]; + $date{location} = $location; return \%data; } diff --git a/cgi/pkgreport.cgi b/cgi/pkgreport.cgi index 87525d91..cca0aaf6 100755 --- a/cgi/pkgreport.cgi +++ b/cgi/pkgreport.cgi @@ -644,7 +644,7 @@ sub pkg_htmlindexentrystatus { status => \%status, days_until => 1, ); - if ($days >= 0) { + if ($days >= 0 and $status->{location} ne 'archive') { $result .= ";\nWill be archived" . ( $days == 0 ? " today" : $days == 1 ? " in $days day" : " in $days days" ) . ""; } } -- 2.39.5