SVN devscripts commit: r563 - in trunk: debian scripts

[Adam D. Barratt]

Author: adam-guest
Date: 2007-03-13 16:31:40 +0000 (Tue, 13 Mar 2007)
New Revision: 563

Modified:
   trunk/debian/changelog
   trunk/scripts/bts.pl
Log:
Use maintainer mboxes by default. Cache "raw" mboxes as $bug.raw.mbox


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2007-03-12 21:30:04 UTC (rev 562)
+++ trunk/debian/changelog	2007-03-13 16:31:40 UTC (rev 563)
@@ -70,7 +70,8 @@
   * bts:
     - handle new status / maintainer mbox links when downloading bugs
       (Closes: #414200)
-    - use bugs.d.o/mbox:NNNN to download the mbox
+    - use the maintainer mbox as the default mbox (i.e. for --mbox and
+      cached as $bug.mbox). The "raw" mboxes are now saved as $bug.raw.mbox
     - attempt to download version graphs in "full caching" mode
   * dscverify: Add --nosigcheck (Closes: #397720)
   * uscan: Fix typo in error message when combining --report-status and
@@ -83,7 +84,7 @@
   * scripts/Makefile: Specify an include directory when running Perl in order
     to handle the source restructuring.
 
- -- Adam D. Barratt <debian-bts at adam-barratt.org.uk>  Mon, 12 Mar 2007 21:27:38 +0000
+ -- Adam D. Barratt <debian-bts at adam-barratt.org.uk>  Tue, 13 Mar 2007 16:28:09 +0000
 
 devscripts (2.9.27) unstable; urgency=low
 

Modified: trunk/scripts/bts.pl
===================================================================
--- trunk/scripts/bts.pl	2007-03-12 21:30:04 UTC (rev 562)
+++ trunk/scripts/bts.pl	2007-03-13 16:31:40 UTC (rev 563)
@@ -1983,7 +1983,7 @@
 	    # This always needs refreshing, as it does change as the bug
 	    # changes
 	}
-	elsif ($cachemode eq 'full' and $msg =~ /^(status|maint)mbox$/) {
+	elsif ($cachemode eq 'full' and $msg =~ /^(status|raw)mbox$/) {
 	    $bug2filename{$msg} = $filename;
 	    # Always need refreshing, as they could change each time the
 	    # bug does
@@ -2046,7 +2046,7 @@
     }
     init_agent() unless $ua;
 
-    my $request = HTTP::Request->new('GET', $btsurl . "mbox:$thing");
+    my $request = HTTP::Request->new('GET', $btscgiurl . "bugreport.cgi?bug=$thing;mboxmaint=yes");
     my $response = $ua->request($request);
     if ($response->is_success) {
 	my $content_length = defined $response->content ?
@@ -2316,16 +2316,16 @@
 	    $filename = "$bug/$1.mbox";
 	}
 	elsif ($ref =~ /^;mbox=yes$/) {
-	    $msg = 'mbox';
-	    $filename = "$bug.mbox";
+	    $msg = 'rawmbox';
+	    $filename = "$bug.raw.mbox";
 	}
 	elsif ($ref =~ /^;mbox=yes;mboxstatus=yes$/) {
 	    $msg = 'statusmbox';
 	    $filename = "$bug.status.mbox";
 	}
-	elsif ($ref =~ /^;mboxmaint=yes;mbox=yes$/) {
-	    $msg = 'maintmbox';
-	    $filename = "$bug.maint.mbox";
+	elsif ($ref =~ /mboxmaint=yes/) {
+	    $msg = 'mbox';
+	    $filename = "$bug.mbox";
 	}
 	elsif ($ref eq '') {
 	    return undef;