Bug 312406 Checksetup fails to check for existing group_group_map for Bugzilla <2.17

patch by A. Karl Kornel <karl@kornel.name>
r=joel, a=justdave

diff --git a/checksetup.pl b/checksetup.pl
index 37067267d115f06859b0dee015debc65112ad513..372d4ff87f8c8788cea867749dc8257c6aae5b00 100755 (executable)
--- a/checksetup.pl
+++ b/checksetup.pl
@@ -4205,6 +4205,11 @@ if (@admins) {
             (user_id, group_id, isbless, grant_type) 
             VALUES ($userid, $adminid, 1, " . GRANT_DIRECT . ")");
     }
+
+    $dbh->bz_lock_tables('groups READ',
+                         'group_group_map WRITE');
+    $dbh->do('DELETE FROM group_group_map WHERE member_id = ?',
+             undef, $adminid);
     $sth = $dbh->prepare("SELECT id FROM groups");
     $sth->execute();
     while ( my ($id) = $sth->fetchrow_array() ) {
@@ -4222,6 +4227,7 @@ if (@admins) {
             (member_id, grantor_id, grant_type) 
             VALUES ($adminid, $id," . GROUP_MEMBERSHIP . ")");
     }
+    $dbh->bz_unlock_tables();
 }