All new accounts created on Gitlab now require administrator approval. If you invite any collaborators, please let Flux staff know so they can approve the accounts.

Commit ceeb3cd0 authored by Russ Fish's avatar Russ Fish

A couple more little bugs in firstinit.

parent a211a659
...@@ -418,7 +418,8 @@ class Group ...@@ -418,7 +418,8 @@ class Group
TBERROR("Group::Initialize: Could not find user $uid!", 1); TBERROR("Group::Initialize: Could not find user $uid!", 1);
} }
if ($emulabgroup->AddNewMember($user) < 0) { if (!$emulabgroup->IsMember($user, $ignore) &&
$emulabgroup->AddNewMember($user) < 0) {
TBERROR("Group::Initialize: Could not add $uid to $TBOPSPID!", 1); TBERROR("Group::Initialize: Could not add $uid to $TBOPSPID!", 1);
} }
......
...@@ -984,6 +984,7 @@ if (! ($project = Project::NewNewProject($leader, $args, $error))) { ...@@ -984,6 +984,7 @@ if (! ($project = Project::NewNewProject($leader, $args, $error))) {
# Need to do some extra work for the first project; eventually move to backend # Need to do some extra work for the first project; eventually move to backend
# #
if ($FirstInitState) { if ($FirstInitState) {
$pid = TBGetFirstInitPid();
Group::Initialize($proj_head_uid, $pid); Group::Initialize($proj_head_uid, $pid);
# #
......
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