Commit 61b82f37 authored by Leigh B Stoller's avatar Leigh B Stoller

Cry me a Git merge conflict.

parent 283e033d
......@@ -2943,7 +2943,23 @@ sub GetTicketAuxAux($$$$$$$$$$$)
# Did we actually run assign?
if ($line =~ /^Assign exited with/) {
$isassignerror = 1;
$done = 0;
$logstuff = "";
$errorstr = "";
$solution = undef;
$insolution = 0;
$violations = undef;
$inviolations = 0;
$precheck = undef;
$inprecheck = 0;
$insummary = 0;
$errorcode = GENIRESPONSE_NO_MAPPING;
}
# Skipping ahead looking for another assign run
next
if ($done);
if ($line =~
/^\s*\*\*\*\s* Resource reservation violation:/) {
$logstuff = $line;
......
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