Commit 77d9f543 authored by Kirk Webb's avatar Kirk Webb

Fix error reporting in previous UE support commit.

parent c1f9632c
......@@ -1181,7 +1181,7 @@ sub reserve_adb_port($$$) {
# Get an IP address for the specified target host (if not already an IP).
$thost = _resolve_host($thost);
if (!$thost) {
warn "could not lookup IP for target host $thost\n";
warn "could not lookup IP for target host!\n";
return 0
}
......
......@@ -2205,7 +2205,8 @@ use overload ('""' => 'Stringify');
# Enable the ADB port forwarding we reserved previously via the mapper.
sub LightUpNodes($@) {
my ($self, @nodelist) = @_;
my $experiment = $self->parent()->experiment();
my $parent = $self->parent();
my $experiment = $parent->experiment();
foreach my $node (@nodelist) {
my $node_id = $node->node_id();
......@@ -2213,7 +2214,9 @@ sub LightUpNodes($@) {
$experiment->GetVirtNodeAttribute($node->vname(),"adb_target",
\$adb_target);
if (system("$TBADB -n $node_id forward") != 0) {
die_noretry("Could not setup adb forwarding for $node_id!");
print STDERR "Could not setup adb forwarding for $node_id!\n";
$parent->noretry(1);
return -1;
}
}
......
......@@ -7386,7 +7386,8 @@ sub InitializePhysNode($$$)
# Do some limited early setup for UE class nodes to get necessary
# information into the PG manifest.
if ($pnode->class eq "ue") {
$pnode->UEConfig();
$pnode->UEConfig() == 0
or return -1;
}
#
......
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