===================================================================
RCS file: /cvs/trango/Net-Telnet-Trango/scripts/update_trango.pl,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- trango/Net-Telnet-Trango/scripts/update_trango.pl	2007/02/01 17:58:33	1.22
+++ trango/Net-Telnet-Trango/scripts/update_trango.pl	2007/02/01 18:44:30	1.23
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $RedRiver: update_trango.pl,v 1.21 2007/02/01 17:08:44 mike Exp $
+# $RedRiver: update_trango.pl,v 1.22 2007/02/01 17:58:33 andrew Exp $
 ########################################################################
 # update_trango.pl *** Updates trango foxes with a new firmware
 # 
@@ -8,7 +8,7 @@
 use strict;
 use warnings;
 
-use YAML qw/ Dump LoadFile /;
+use YAML qw/ LoadFile /;
 use Net::TFTP;
 use lib '.';
 use Net::Telnet::Trango;
@@ -16,21 +16,11 @@
 my $config_file = shift || 'update_trango.yaml';
 my $max_tries = 3;
 
-
 my $l = Mylogger->new( { log_prefix => 'UT' } );
 
-
 $l->sp("Reading config file '$config_file'");
 my $conf = LoadFile($config_file);
 
-#$l->sp("  Hardware Type: $conf->{'type'}");
-#$l->sp("  File Name:     $conf->{'file_name'}");
-#$l->sp("  File Size:     $conf->{'file_size'}");
-#$l->sp("  File Checksum: $conf->{'file_cksum'}");
-#$l->sp("  FW Version:    $conf->{'ver'}");
-#$l->sp("  FW Checksum:   $conf->{'cksum'}");
-#$l->sp("");
-
 my @foxes = (
 '10.100.1.2',
 '10.100.2.2',
@@ -62,7 +52,7 @@
 	}
 
     my $host_type = $t->host_type;
-    if (uc($conf->{'firmware_type'}) eq 'FPGA') {
+    if ($firmware_type eq 'FPGA') {
       $host_type =~ s/\s.*$//;
     }
 
@@ -72,10 +62,14 @@
 	  next;
 	}
 
-    unless ($t->logged_in) {
+    if (! $t->logged_in) {
       $l->p("Logging in");
-      $t->login($conf->{general}->{'password'}) || die "Couldn't login: $!";
-	  $t->exit();
+      $t->login($conf->{general}->{'password'});
+      unless ($t->logged_in) {
+        $l->p('Failed!');
+        $t->bye();
+        next;
+      }
     }
 
 	foreach my $k (keys %{ $conf->{general} }) {
@@ -84,27 +78,31 @@
 	$conf->{$firmware_type}->{$host_type}->{firmware_type} ||= $firmware_type;
 	$conf->{$firmware_type}->{$host_type}->{type} ||= $host_type;
 
-    $l->sp("Updating: $host_type $firmware_type on $fox");
+    $l->sp("$host_type $firmware_type");
     $l->p("Sending commands");
     ## Send commands
-    if ( upload($t, $conf->{$firmware_type}->{$host_type}) ) {
+    my $rc = upload($t, $conf->{$firmware_type}->{$host_type});
+	if ($rc) {
       $l->sp("Successfull!");
 	  $needs_reboot = 1;
+    } elsif (defined $rc) {
+	  $l->sp("Already up to date");
     } else {
 	  $l->sp("Failed");
+	  $t->bye;
+	  next;
     }
   
-    $l->sp("");
   }
 
   if ($needs_reboot) {
     $l->sp("Rebooting $fox");
     $t->reboot;
   } else {
-    $l->sp("Exiting $fox");
-    $t->exit();
+    $l->sp("Bye $fox");
+    $t->bye();
   }
-  exit;
+  $l->sp("");
 }
 
 sub upload
@@ -117,23 +115,30 @@
   my $fw_type = $conf->{firmware_type};
 
   my $ver = $t->ver;
-  print Dump $ver;
-  $l->p("Current version '" . $ver->{$fw_type . ' Version'} . "'");
-  exit;
 
   if (
     $ver->{$fw_type . ' Version'}  eq $conf->{'ver'} && 
     $ver->{$fw_type . ' Checksum'} eq $conf->{'cksum'}
   ) {
-    $l->sp("Already updated!");
     return 0;
   }
 
+  $l->sp("Config information:");
+  $l->sp("  Hardware Type: $conf->{'type'}");
+  $l->sp("  File Name:     $conf->{'file_name'}");
+  $l->sp("  File Size:     $conf->{'file_size'}");
+  $l->sp("  File Checksum: $conf->{'file_cksum'}");
+  $l->sp("  Conf Version:  $conf->{'ver'}");
+  $l->sp("  Cur  Version:  $ver->{$fw_type . ' Version'}");
+  $l->sp("  Conf Checksum: $conf->{'cksum'}");
+  $l->sp("  Cur  Checksum: $ver->{$fw_type . ' Checksum'}");
+
+  $l->sp("Updating");
   my $try = 0;
   while (1) {
     if ($try >= $max_tries) {
       $l->sp("Couldn't update in $max_tries tries!");
-      return undef;
+      return;
     }
     $try++;