Commit to mainline by don@debian.org -- merge changes from dla source

[Debbugs Maintainers]

------------------------------------------------------------
revno: 877
committer: Debian BTS <[EMAIL PROTECTED]>
branch nick: mainline
timestamp: Fri 2008-12-05 00:44:07 +0000
message:
  merge changes from dla source
    ------------------------------------------------------------
    revno: 738.3.35
    committer: Don Armstrong <[EMAIL PROTECTED]>
    branch nick: source
    timestamp: Thu 2008-12-04 16:37:02 -0800
    message:
       * remove useless escaping in maybelink, closes #507807
    ------------------------------------------------------------
    revno: 738.3.34
    committer: Don Armstrong <[EMAIL PROTECTED]>
    branch nick: source
    timestamp: Thu 2008-12-04 16:32:56 -0800
    message:
       * add missing import of read_bug to process
    ------------------------------------------------------------
    revno: 738.3.33
    committer: Don Armstrong <[EMAIL PROTECTED]>
    branch nick: source
    timestamp: Thu 2008-12-04 16:31:36 -0800
    message:
       * Only replace indices if changes have been made to the index

=== modified file 'Debbugs/CGI.pm'
--- Debbugs/CGI.pm      2008-12-03 04:00:32 +0000
+++ Debbugs/CGI.pm      2008-12-05 00:44:04 +0000
@@ -537,7 +537,7 @@
     my ($links,$regex,$join) = @_;
     if (not defined $regex and not defined $join) {
         $links =~ 
s{((?:ftp|http|https)://[\S~-]+?/?)([\)\'\:\.\,]?(?:\s|\.<|$))}
-                   {q(<a 
href=\").html_escape($1).q(\">).html_escape($1).q(</a>).$2}geimo;
+                   {q(<a 
href=").html_escape($1).q(">).html_escape($1).q(</a>).$2}geimo;
         return $links;
     }
     $join = ' ' if not defined $join;

=== modified file 'scripts/gen-indices'
--- scripts/gen-indices 2008-06-19 00:10:35 +0000
+++ scripts/gen-indices 2008-12-05 00:44:04 +0000
@@ -174,6 +174,7 @@
        return $email;
 }
 
+my $modification_made = 0;
 my $cnt = 0;
 
 my @dirs = ($initialdir);
@@ -196,6 +197,7 @@
                }
                next if $stat->mtime < $time;
                my $fdata = readbug($bug, $initialdir);
+               $modification_made = 1;
                addbugtoindex("package", $bug, split /[\s,]+/, 
$fdata->{"package"});
                addbugtoindex("tag", $bug, split /[\s,]+/, 
$fdata->{"keywords"});
                addbugtoindex('submitter-email', $bug,
@@ -232,12 +234,17 @@
      }
 }
 
-
 for my $i (@indexes) {
-       untie %{$slow_index{$i}};
+    untie %{$slow_index{$i}};
+    # Only move if we've made changes, otherwise unlink
+    if ($modification_made) {
        move("$indexdest/by-$i$suffix.idx.new", "$indexdest/by-$i$suffix.idx");
        # We do this, because old versions of touch don't support -d '@epoch'
        system('touch','-d',"1/1/1970 UTC + 
${start_time}secs","$indexdest/by-$i$suffix.idx");
+    }
+    else {
+       unlink("$indexdest/by-$i$suffix.idx.new");
+    }
 }
 
 unlink($config{spool_dir}.'/lock/gen-indices')

=== modified file 'scripts/process'
--- scripts/process     2008-12-02 17:21:01 +0000
+++ scripts/process     2008-12-05 00:44:04 +0000
@@ -17,7 +17,7 @@
 use Debbugs::Packages qw(getpkgsrc);
 use Debbugs::User qw(read_usertags write_usertags);
 use Debbugs::Common qw(:lock get_hashname);
-use Debbugs::Status qw(writebug isstrongseverity lockreadbugmerge lockreadbug);
+use Debbugs::Status qw(writebug isstrongseverity lockreadbugmerge lockreadbug 
read_bug :versions);
 
 use Debbugs::CGI qw(html_escape bug_url);
 
@@ -25,7 +25,6 @@
 
 use Debbugs::Text qw(:templates);
 
-use Debbugs::Status qw(:versions);
 use Debbugs::Config qw(:globals :config);
 
 use Debbugs::Control qw(append_action_to_log);