Commit 9007d758 authored by Mike Hibler's avatar Mike Hibler

Merge remote branch 'central/master'

parents 039dec51 45a5c7c9
......@@ -68,7 +68,11 @@ if ($exitcode) {
# Pull out relevent info
print SERR "ASSIGN FAILED:\n";
while ((shift @out) !~ /^[\w\s]*precheck:$/) {}
while (($_ = shift @out) && !/^[\w\s]*precheck:$/) {}
if (not defined $_) {
tberror({cause=>'internal'},
"Invalid Assign Output (expected \"precheck:\" line).");
}
while (($_ = shift @out)) {
/^[\w\s]*precheck:$/ && do {
next;
......@@ -81,7 +85,11 @@ if ($exitcode) {
push @err, $_;
}
if ($violations) {
while ((shift @out) !~ /^Violations:/) {}
while (($_ = shift @out) && !/^Violations:/) {}
if (not defined $_) {
tberror({cause=>'internal'},
"Invalid Assign Output (expected \"Violations:\" line).");
}
while (($_ = shift @out)) {
if (/^Nodes:/) {
last;
......
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