[project @ 2005-07-17 19:18:58 by cjwatson]

[debbugs.git] / migrate / debbugs-makeversions

diff --git a/migrate/debbugs-makeversions b/migrate/debbugs-makeversions
index a072e31fc3fe42eef0f4a301edcd0aa0b9617098..ed5acee3ba8dbaebe5407797c91bc8a4e44e9d9c 100755 (executable)
--- a/migrate/debbugs-makeversions
+++ b/migrate/debbugs-makeversions
@@ -161,6 +161,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 +198,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();
            }