@@ -94,7 +94,7 @@ sub best_status {
|
||||
my $cur_status = '';
|
||||
|
||||
foreach my $status (reverse @{ $job->_statuslist }) {
|
||||
next if $status->phase
|
||||
next if $status->phase
|
||||
and $status->phase !~ m/^(?:early|main|store|late)$/;
|
||||
|
||||
if ($status->level >= $cur_level) {
|
||||
@@ -123,7 +123,7 @@ sub finalise_status {
|
||||
my $max_level = Status->error()->level;
|
||||
|
||||
foreach my $status (reverse @{ $job->_statuslist }) {
|
||||
next if $status->phase
|
||||
next if $status->phase
|
||||
and $status->phase !~ m/^(?:check|early|main|store|late)$/;
|
||||
|
||||
# done() from check phase should not be the action's done()
|
||||
|
||||
@@ -89,7 +89,7 @@ sub fixup_device_auth {
|
||||
push @new_stanzas, $stanza;
|
||||
}
|
||||
|
||||
# legacy config
|
||||
# legacy config
|
||||
# note: read strings tried before write
|
||||
# note: read-write is no longer used for read operations
|
||||
|
||||
|
||||
@@ -100,18 +100,18 @@ sub snmp_comm_reindex {
|
||||
}
|
||||
$prefix ||= 'vlan-';
|
||||
|
||||
if ($vlan =~ /^[0-9]+$/i && $vlan) {
|
||||
if ($vlan =~ /^[0-9]+$/i && $vlan) {
|
||||
debug sprintf '[%s] reindexing to "%s%s" (ver: %s, class: %s)',
|
||||
$device->ip, $prefix, $vlan, $ver, $snmp->class;
|
||||
$snmp->update(Context => ($prefix . $vlan));
|
||||
} elsif ($vlan =~ /^[a-z0-9]+$/i && $vlan) {
|
||||
} elsif ($vlan =~ /^[a-z0-9]+$/i && $vlan) {
|
||||
debug sprintf '[%s] reindexing to "%s" (ver: %s, class: %s)',
|
||||
$device->ip, $vlan, $ver, $snmp->class;
|
||||
$snmp->update(Context => ($vlan));
|
||||
} else {
|
||||
} else {
|
||||
debug sprintf '[%s] reindexing without context (ver: %s, class: %s)',
|
||||
$device->ip, $ver, $snmp->class;
|
||||
$snmp->update(Context => '');
|
||||
$snmp->update(Context => '');
|
||||
}
|
||||
}
|
||||
else {
|
||||
|
||||
Reference in New Issue
Block a user