Support 7 digit bugs in bugspam.cgi

[debbugs.git] / migrate / debbugs-makeversions

diff --git a/migrate/debbugs-makeversions b/migrate/debbugs-makeversions
index 6b0b5462b301a84b86fb985d5f994740969fbbc9..fd70f2dcfb6262a3f810effa1334555bc0a41fb1 100755 (executable)
--- a/migrate/debbugs-makeversions
+++ b/migrate/debbugs-makeversions
@@ -3,6 +3,12 @@
 # guesswork, based on Version: pseudo-headers and closing mails that look
 # like Debian changelogs. The latter in particular is somewhat heuristic.
 
+# <@aj> Hackin' on the BTS, Feelin' like it'll take forever; Oh you better
+#       hold it's hand, when it dies on names so clever. These are the best
+#       bugs of our life. It's up to archive-slash-69, man we were killin'
+#       time, we were young and resltess, we needed to unwind. I guess
+#       nothin' can last forever - forever, no...
+
 my $config_path = '/etc/debbugs';
 my $lib_path = '/usr/lib/debbugs';
 
@@ -75,7 +81,7 @@ sub getbuginfo ($)
                $fv =~ s/;.*//;
                $fv =~ s/ *\(.*\)//;
                # Strip off other random junk at the end of a version.
-               $fv =~ s/ *[A-Za-z].*//;
+               $fv =~ s/ +[A-Za-z].*//;
                $ver = $fv;
            }
        }
@@ -161,6 +167,11 @@ while (defined(my $dir = readdir DB)) {
            next;
        }
 
+       if (@{$status->{found_versions}} or @{$status->{fixed_versions}}) {
+           unlockreadbugmerge($locks);
+           next;
+       }
+
        my @merges = ();
        # Only process the lowest of each set of merged bugs.
        if (length $status->{mergedwith}) {