[TWiki-Dev] [SVN] KennethLavrsen r12665 - twiki/branches/Patch04x01/lib/TWiki/Configure/Checkers/RCS

[<de...@de...>]

Author: KennethLavrsen
Date: 2007-01-30 15:37:24 -0600 (Tue, 30 Jan 2007)
New Revision: 12665

Modified:
   twiki/branches/Patch04x01/lib/TWiki/Configure/Checkers/RCS/Checker.pm
Log:
Item3473: the checker for RCS programs was a bit suspect.
Should have been merged into Patch04x01 before Item marked
as patch was set Waiting for Release


Modified: twiki/branches/Patch04x01/lib/TWiki/Configure/Checkers/RCS/Checker.pm
===================================================================
--- twiki/branches/Patch04x01/lib/TWiki/Configure/Checkers/RCS/Checker.pm	2007-01-30 21:26:22 UTC (rev 12664)
+++ twiki/branches/Patch04x01/lib/TWiki/Configure/Checkers/RCS/Checker.pm	2007-01-30 21:37:24 UTC (rev 12665)
@@ -39,16 +39,13 @@
         $err .= $key.' is not set';
     } else {
         my $version = `$prog -V` || '';
-        if( $@ ) {
-            $err .= $this->ERROR($prog.' returned an error: '.$@ );
-        } elsif ( $version ne '' ) {
-            $version =~ /(\d+(\.\d+)+)/;
+        if ( $version =~ /(\d+(\.\d+)+)/ ) {
             $version = $1;
             $mess .= " ($prog is version $version)";
         } else {
             $err .= $this->ERROR($prog.' did not return a version number (or might not exist..)');
         }
-        if( $version && $version < $rcsverRequired ) {
+        if( $version =~ /^\d/ && $version < $rcsverRequired ) {
             # RCS too old
             $err .= $prog.' is too old, upgrade to version '.
               $rcsverRequired.' or higher.';