From 5764cc1c0f79b56fdf5389d2b0dcb2ab7e54723d Mon Sep 17 00:00:00 2001
From: minima <minima>
Date: Mon, 14 Feb 2005 22:03:48 +0000
Subject: [PATCH] fix warnings on $BRANCH

---
 perl/AMsg.pm          | 2 +-
 perl/AnnTalk.pm       | 2 +-
 perl/Aranea.pm        | 2 +-
 perl/DXChannel.pm     | 2 +-
 perl/DXCommandmode.pm | 2 +-
 perl/DXDebug.pm       | 2 +-
 perl/DXProt.pm        | 2 +-
 perl/DXProtout.pm     | 2 +-
 perl/ExtMsg.pm        | 2 +-
 perl/Filter.pm        | 2 +-
 perl/Spot.pm          | 2 +-
 perl/Thingy.pm        | 2 +-
 perl/Thingy/Dx.pm     | 2 +-
 perl/Thingy/Hello.pm  | 2 +-
 perl/Thingy/Ping.pm   | 2 +-
 perl/Thingy/Rt.pm     | 2 +-
 perl/Thingy/T.pm      | 2 +-
 perl/VE7CC.pm         | 2 +-
 perl/Verify.pm        | 2 +-
 perl/cluster.pl       | 2 +-
 20 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/perl/AMsg.pm b/perl/AMsg.pm
index f1a7112f..0a26bde2 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;
 
diff --git a/perl/AnnTalk.pm b/perl/AnnTalk.pm
index 0b564064..fb745edc 100644
--- a/perl/AnnTalk.pm
+++ b/perl/AnnTalk.pm
@@ -40,7 +40,7 @@ $filterdef = bless ([
 
 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;
 
diff --git a/perl/Aranea.pm b/perl/Aranea.pm
index f3d07eaf..ecf57055 100644
--- a/perl/Aranea.pm
+++ b/perl/Aranea.pm
@@ -28,7 +28,7 @@ use Thingy;
 
 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;
 
diff --git a/perl/DXChannel.pm b/perl/DXChannel.pm
index 69654429..e2e3f0d2 100644
--- a/perl/DXChannel.pm
+++ b/perl/DXChannel.pm
@@ -122,7 +122,7 @@ $count = 0;
 
 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;
 
diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index e207b0df..7371a869 100644
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -53,7 +53,7 @@ $msgpolltime = 3600;			# the time between polls for new messages
 
 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;
 
diff --git a/perl/DXDebug.pm b/perl/DXDebug.pm
index 30fe2b25..124ddfe1 100644
--- a/perl/DXDebug.pm
+++ b/perl/DXDebug.pm
@@ -28,7 +28,7 @@ $cleandays = 100;
 
 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;
 
diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 712f933e..d8048ffb 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -45,7 +45,7 @@ use strict;
 
 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;
 
diff --git a/perl/DXProtout.pm b/perl/DXProtout.pm
index a8a609b9..27b54700 100644
--- a/perl/DXProtout.pm
+++ b/perl/DXProtout.pm
@@ -21,7 +21,7 @@ use strict;
 
 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;
 
diff --git a/perl/ExtMsg.pm b/perl/ExtMsg.pm
index f08a07c9..5d001ae4 100644
--- a/perl/ExtMsg.pm
+++ b/perl/ExtMsg.pm
@@ -23,7 +23,7 @@ use IPC::Open3;
 
 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;
 
diff --git a/perl/Filter.pm b/perl/Filter.pm
index ff4ab2e8..4b32ab50 100644
--- a/perl/Filter.pm
+++ b/perl/Filter.pm
@@ -36,7 +36,7 @@ use strict;
 
 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;
 
diff --git a/perl/Spot.pm b/perl/Spot.pm
index ef460a07..d7c990d1 100644
--- a/perl/Spot.pm
+++ b/perl/Spot.pm
@@ -23,7 +23,7 @@ use strict;
 
 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;
 
diff --git a/perl/Thingy.pm b/perl/Thingy.pm
index c358389f..0921abd8 100644
--- a/perl/Thingy.pm
+++ b/perl/Thingy.pm
@@ -17,7 +17,7 @@ package Thingy;
 
 use vars qw($VERSION $BRANCH @queue @permin @persec);
 $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;
 
diff --git a/perl/Thingy/Dx.pm b/perl/Thingy/Dx.pm
index b711a256..38fb2d2d 100644
--- a/perl/Thingy/Dx.pm
+++ b/perl/Thingy/Dx.pm
@@ -12,7 +12,7 @@ package Thingy::Dx;
 
 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;
 
diff --git a/perl/Thingy/Hello.pm b/perl/Thingy/Hello.pm
index c991a901..63b352b4 100644
--- a/perl/Thingy/Hello.pm
+++ b/perl/Thingy/Hello.pm
@@ -12,7 +12,7 @@ package 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;
 
diff --git a/perl/Thingy/Ping.pm b/perl/Thingy/Ping.pm
index 39fd55ba..1ee84085 100644
--- a/perl/Thingy/Ping.pm
+++ b/perl/Thingy/Ping.pm
@@ -12,7 +12,7 @@ package Thingy::Ping;
 
 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;
 
diff --git a/perl/Thingy/Rt.pm b/perl/Thingy/Rt.pm
index bf178360..3a453a26 100644
--- a/perl/Thingy/Rt.pm
+++ b/perl/Thingy/Rt.pm
@@ -12,7 +12,7 @@ package Thingy::Rt;
 
 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;
 
diff --git a/perl/Thingy/T.pm b/perl/Thingy/T.pm
index ee8928ac..d66011bd 100644
--- a/perl/Thingy/T.pm
+++ b/perl/Thingy/T.pm
@@ -12,7 +12,7 @@ package Thingy::T;
 
 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;
 
diff --git a/perl/VE7CC.pm b/perl/VE7CC.pm
index 14ef2131..ee524604 100644
--- a/perl/VE7CC.pm
+++ b/perl/VE7CC.pm
@@ -21,7 +21,7 @@ use strict;
 
 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;
 
diff --git a/perl/Verify.pm b/perl/Verify.pm
index 849b2ed2..5809b810 100644
--- a/perl/Verify.pm
+++ b/perl/Verify.pm
@@ -17,7 +17,7 @@ use Digest::SHA1 qw(sha1_base64);
 
 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;
 
diff --git a/perl/cluster.pl b/perl/cluster.pl
index eea057db..6178aa49 100755
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -132,7 +132,7 @@ $allowdxby = 0;					# 1 = allow "dx by <othercall>", 0 - don't allow it
 
 use vars qw($VERSION $BRANCH $build $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 += 1;				# add an offset to make it bigger than last system
 $main::build += $VERSION;
 $main::branch += $BRANCH;
-- 
2.43.0