Tweaking of close bug code

diff --git a/script/git-to-bugzilla.pl b/script/git-to-bugzilla.pl
index ef0c87006d89b2163644e2c9b16b9fcc4ee8f2fc..9fbddbac8659f5ff50a0122d22a6ab34f42ca1ab 100755 (executable)
--- a/script/git-to-bugzilla.pl
+++ b/script/git-to-bugzilla.pl
@@ -43,8 +43,8 @@ sub update_bugzilla {
         $bz->additional_comments( join( "\n", $header, @{ $info->{all} } ) );
     }
 
         $bz->additional_comments( join( "\n", $header, @{ $info->{all} } ) );
     }
 

-    $bz->change_status("fixed")  if ( $set->{action} eq 'fixes' );
-    $bz->change_status("closed") if ( $set->{action} eq 'closes' );
+    $bz->change_status("fixed")  if ( $set->{action} =~ /fixes/ );
+    $bz->change_status("closed") if ( $set->{action} =~ /closes/ );

 
     $bz->commit;
 
 
     $bz->commit;
 


@@ -74,7 +74,6 @@ sub find_bugzilla_references {
         }
 
         # remap actions
         }
 
         # remap actions

-        $action = 'closes' if ( $action =~ /^fix/ );

 
         push( @results, { bug => $bugid, action => $action } );
         ##printf( "%s\n\taction = %s bugid = %s\n", $info->{rev}, $action, $bugid );
 
         push( @results, { bug => $bugid, action => $action } );
         ##printf( "%s\n\taction = %s bugid = %s\n", $info->{rev}, $action, $bugid );