Bug 134465 - Don't die() if the admin email address doesn't match the

regexp.
r=justdave x2

diff --git a/checksetup.pl b/checksetup.pl
index d98676073ae9b78a463f196bd83607ba700165dc..bc8f9601e01804221a6d7cae8c21f12895575d0e 100755 (executable)
--- a/checksetup.pl
+++ b/checksetup.pl
@@ -1678,7 +1678,10 @@ if ($sth->rows == 0) {
       unless ($login =~ /$mailcheckexp/) {
         print "\nThe login address is invalid:\n";
         print "$mailcheck\n";
-        die "Please try again\n";
+        print "You can change this test on the params page once checksetup has successfully\n";
+        print "completed.\n\n";
+        # Go round, and ask them again
+        $login = "";
       }
     }
     $login = $dbh->quote($login);