Skip to content

bugzilla
bugzilla
Commit 80bd2397 authored by bugreport%peshkin.net's avatar bugreport%peshkin.net
Browse files
Options

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
parent c872f810
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 0 deletions
checksetup.pl
View file @ 80bd2397
...@@ -4205,6 +4205,11 @@ if (@admins) { ...@@ -4205,6 +4205,11 @@ if (@admins) {
(user_id, group_id, isbless, grant_type) (user_id, group_id, isbless, grant_type)
VALUES ($userid, $adminid, 1, " . GRANT_DIRECT . ")"); 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 = $dbh->prepare("SELECT id FROM groups");
$sth->execute(); $sth->execute();
while ( my ($id) = $sth->fetchrow_array() ) { while ( my ($id) = $sth->fetchrow_array() ) {
...@@ -4222,6 +4227,7 @@ if (@admins) { ...@@ -4222,6 +4227,7 @@ if (@admins) {
(member_id, grantor_id, grant_type) (member_id, grantor_id, grant_type)
VALUES ($adminid, $id," . GROUP_MEMBERSHIP . ")"); VALUES ($adminid, $id," . GROUP_MEMBERSHIP . ")");
} }
$dbh->bz_unlock_tables();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment