From: doogie <>
Date: Thu, 18 Sep 2003 05:14:43 +0000 (-0800)
Subject: [project @ 2003-09-17 22:14:43 by doogie]
X-Git-Tag: release/2.6.0~791
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;ds=sidebyside;h=190b7417ccf381f37b10fc7d6d20a344efa5f528;p=debbugs.git

[project @ 2003-09-17 22:14:43 by doogie]
Display how long until a resolved bug will be archived in pkgreport.cgi.
---

diff --git a/cgi/common.pl b/cgi/common.pl
index 28162b1..524d60f 100644
--- a/cgi/common.pl
+++ b/cgi/common.pl
@@ -4,6 +4,7 @@ use DB_File;
 use Fcntl qw/O_RDONLY/;
 use Mail::Address;
 use MLDBM qw/DB_File/;
+use POSIX;
 
 $config_path = '/etc/debbugs';
 $lib_path = '/usr/lib/debbugs';
@@ -301,6 +302,8 @@ sub htmlindexentrystatus {
         }
     } elsif (length($status{done})) {
         $result .= ";\n<strong>Done:</strong> " . htmlsanit($status{done});
+        $days = ceil($debbugs::gRemoveAge - -M buglog($status{id}));
+	$result .= ";\n<strong>Will Be Archived:</strong>" . ( $days == 0 ? " today" : $days == 1 ? " in $days day" : " in $days days" );
     }
 
     unless (length($status{done})) {
@@ -734,6 +737,7 @@ sub getbugstatus {
     my $location = getbuglocation( $bugnum, 'summary' );
     return {} if ( !$location );
     %status = %{ readbug( $bugnum, $location ) };
+    $status{ id } = $bugnum;
 
     $status{found_versions} = [];
     $status{fixed_versions} = [];
diff --git a/debian/changelog b/debian/changelog
index 936ec4b..a9652bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,8 @@ debbugs (2.4.2) UNRELEASED; urgency=low
       generic.  There is now no longer 2 nested loops, to do the grouping.
       This makes adding new grouping levels simpler for the future.
     - Add in a Table of Contents to pkgreport.cgi.
+    - Display how long until a resolved bug will be archived in
+      pkgreport.cgi.
 
  -- Colin Watson <cjwatson@debian.org>  Fri, 20 Jun 2003 18:57:25 +0100