Commit b28dbcff authored by Kevin Atkinson's avatar Kevin Atkinson

In addprojadminlist die if unable to add testbed-approval to mailing list.

However, when creating a new project, don't die if addprojadminlist
fails.  Instead send mail to testbed-ops so someone can fix it up
manually.
parent 1266ca9e
......@@ -164,6 +164,9 @@ if ($CONTROL ne $BOSSNODE) {
system("echo $TBAPPROVAL | ".
"$SSH -host $CONTROL $MMBINDIR/add_members -r - $proj-admin");
if ($?) {
fatal("Unable to add $TBAPPROVAL to $proj-admin");
}
my $status = $?;
TBScriptUnlock();
......
......@@ -265,8 +265,13 @@ sub Create($$$$)
# Now create the per-project Admin List
#
if ($MAILMANSUPPORT) {
system("$ADDPROJADMINLIST $pid") == 0 or
die("$ADDPROJADMINLIST $pid failed!");
my $res = system("$ADDPROJADMINLIST $pid");
if ($res != 0) {
SENDMAIL($TBOPS, "Addprojadminlist failed!",
"\"$ADDPROJADMINLIST $pid\" failed.\n".
"Details most likely in testbed-logs mail with \"suexec: webnewproj\"\n".
"in the subject.\n");
}
}
return $newproject;
......
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