X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FAMsg.pm;h=0b94c15d4bfc48a2d810b030919255dc6b208b56;hb=9247dc52598db705b9cf6cbbec16c3919ac5e1d7;hp=f1a7112f5c2159e735d91525358d256ee7f7a0f0;hpb=3c772f881b05406e916a1bf959aa1266c7e216b9;p=spider.git diff --git a/perl/AMsg.pm b/perl/AMsg.pm index f1a7112f..0b94c15d 100644 --- a/perl/AMsg.pm +++ b/perl/AMsg.pm @@ -23,7 +23,7 @@ use Thingy::Hello; use vars qw($VERSION $BRANCH); $VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ ); -$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ || (0,0)); +$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /^\d+\.\d+(?:\.(\d+)\.(\d+))?$/ || (0,0)); $main::build += $VERSION; $main::branch += $BRANCH; @@ -71,7 +71,7 @@ sub dequeue # this is the first stage that we have a callsign # do we have a hello? $msg =~ s/[\r\n]+$//; - if ($msg =~ m{RT,[0-9A-F,]+|HELLO}) { + if ($msg =~ m{|HELLO,}) { # a possibly valid HELLO line, process it $conn->new_channel($msg); }