fix warnings on $BRANCH

diff --git a/perl/AMsg.pm b/perl/AMsg.pm
index f1a7112f5c2159e735d91525358d256ee7f7a0f0..0a26bde217a87e46e23b13da6922dc195efcc3db 100644 (file)
--- 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 0b564064ee15989bbc2c1af12571ccd790357082..fb745edcf15bf0275b4ef134bd221aa26a5978ad 100644 (file)
--- 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 f3d07eaf648768682c8c59019a02bacd71bcf639..ecf57055e7924c57f8e6a2ff4581f1c7563051d3 100644 (file)
--- 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 696544293791e147552aff791992eb50a5df9d0c..e2e3f0d2d2b4aefd4d371259581ee2890353633e 100644 (file)
--- 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 e207b0df6da8515666e2e34720c9dbcbe72d3cc3..7371a8690ab781391150847d33b86d02747d0a9e 100644 (file)
--- 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 30fe2b25d4dee2f6cd1383c674dca655be6f12f3..124ddfe1d73756c387468e7c27664ac1013df6ad 100644 (file)
--- 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 712f933e833f29bd8a4508f79be4df614d4d9dec..d8048ffbb6be6e98434d63f513a5512a49b491aa 100644 (file)
--- 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 a8a609b96d76cfbdc2024d49453477f35d792161..27b547002548448b5d79b874e78a93e1b65a939f 100644 (file)
--- 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 f08a07c919f1fed68b2c2a95f0c4fadcf5d36cae..5d001ae4358ee9484a60dc70e8469a145c7cf7d8 100644 (file)
--- 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 ff4ab2e868e95aff35aa6014edaa2018c98045c5..4b32ab50407168f05eca8fdf6a1d557f9c40ea0d 100644 (file)
--- 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 ef460a07ec0d036a1923bc3208fd604feb24ef9e..d7c990d1cabedf9baf1bdfb3f1d4fec031008204 100644 (file)
--- 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 c358389fd0318f1f96632f52e06553d41089d97f..0921abd818414d2c2dac083fd5aab6033224cedc 100644 (file)
--- 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 b711a256aefa0cbff5e6fd509b3d89395425b2d6..38fb2d2d31fd5f109e486b3e4caba8aefc0a9edf 100644 (file)
--- 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 c991a901e274a1036e348be0a763efc96996cb17..63b352b4f06dcc3bd0474859fbbfeffa6344f3ad 100644 (file)
--- 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 39fd55bac40499b40d414c951f86553f6d70b56d..1ee840858123836e6abe39fa1d19fd7bec851fdb 100644 (file)
--- 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 bf178360f0a96f272e76c2684185f68b8c69ce1c..3a453a26eec6a41198d8892fed37b50c51213024 100644 (file)
--- 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 ee8928ac66536991ed69a57b5693e66458139348..d66011bdfb983aaa26179b6f4b792eae601ddc72 100644 (file)
--- 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 14ef213105541600bb806abcd3e380b7c899a879..ee524604d00bfe191a5798acf87fd38bfd8f62ad 100644 (file)
--- 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 849b2ed22e86b95e61f31c41a5a46618a21c4bee..5809b81004c36d8b57e023c5691e151ad24e6097 100644 (file)
--- 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 eea057db5c8efe318e11f6ce0c4e867a21e88de7..6178aa49f6010f9239b6a268cc3e6a10dccf2805 100755 (executable)
--- 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;