--- mdap-server.pl 2007/11/18 11:07:23 72 +++ mdap-server.pl 2007/12/05 23:13:56 86 @@ -234,6 +234,7 @@ my $board = $h->{'_BOARD_NAME'} || die "no _BOARD_NAME?"; if ( fw_exists( $board ) ) { my $build = $h->{'_BUILD'} || die "no _BUILD?"; + $build =~ s/^(\d+)\.(\d+)\.(\d+)\.(\d+).*$/$1.$2.$3.$4/; my $new_build = fw_build( $board ); if ( $build ne $new_build ) { print "+ $ant $board version $build -> $new_build\n"; @@ -263,24 +264,24 @@ } } - if ( $plugins ) { - foreach my $plugin ( MDAP->plugins ) { - warn "## calling $plugin\n" if $debug; - if ( my $command = $plugin->check( $h ) ) { + } else { + once "!! NO FIRMWARE for $board in $tftp_path for ant $ant, skipping update"; + } + + if ( $plugins ) { + foreach my $plugin ( MDAP->plugins ) { + warn "## calling $plugin\n" if $debug; + if ( my $command = $plugin->check( $h ) ) { - warn ">> $plugin $ant $board ", - $h->{'ANT-NAME'}, " ", - $h->{'_BUILD'}, " ", - "\t:$command\n"; - - mdap_send("EXEC-CLI MDAP/$mdap_ver\r\nCLI-CMD:$command\r\nSEQ-NR:1\r\nTO-ANT:$ant\r\nUSER-ID:$user_id\r\nUSER-PWD:$user_pwd\r\n"); - last; - } + warn ">> $plugin $ant $board ", + $h->{'ANT-NAME'}, " ", + $h->{'_BUILD'}, " ", + "\t:$command\n"; + + mdap_send("EXEC-CLI MDAP/$mdap_ver\r\nCLI-CMD:$command\r\nSEQ-NR:1\r\nTO-ANT:$ant\r\nUSER-ID:$user_id\r\nUSER-PWD:$user_pwd\r\n"); + last; } } - - } else { - once "!! NO FIRMWARE for $board in $tftp_path for ant $ant, skipping update"; } } elsif ( $type eq 'REPLY-EXEC-CLI' ) {