X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=migrate%2Fdebbugs-makeversions;h=fd70f2dcfb6262a3f810effa1334555bc0a41fb1;hb=509dc1d30d2083164bf434e52348065b03fa8787;hp=a072e31fc3fe42eef0f4a301edcd0aa0b9617098;hpb=78018e337a69b8b7c642aaf45f2a164e0584ad81;p=debbugs.git

diff --git a/migrate/debbugs-makeversions b/migrate/debbugs-makeversions
index a072e31..fd70f2d 100755
--- 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}) {
@@ -193,7 +204,7 @@ while (defined(my $dir = readdir DB)) {
 	    my $outstatus = readbug($out, $db);
 	    $outstatus->{found_versions} = [@$found_versions];
 	    $outstatus->{fixed_versions} = [@$fixed_versions];
-	    writebug($out, $outstatus, $db);
+	    writebug($out, $outstatus, $db, 2, 'disable bughook');
 	    if ($out != $bug) {
 		unfilelock();
 	    }