fix bug in version checking code after recent change

[buildfarm-server.git] / trunk / cgi-bin / pgstatus.pl

diff --git a/trunk/cgi-bin/pgstatus.pl b/trunk/cgi-bin/pgstatus.pl
index 7d2f7872dbf88e6aebc6ea2b74b57d6efa562cbe..481eb5ad3855035488f6938ce6374260eb320996 100755 (executable)
--- a/trunk/cgi-bin/pgstatus.pl
+++ b/trunk/cgi-bin/pgstatus.pl
@@ -223,8 +223,10 @@ else
 if ($min_script_version)
 {
        $client_conf->{script_version} ||= '0.0';
+       my $cli_ver = $client_conf->{script_version} ;
+       $cli_ver =~ s/^REL_//;
        my ($minmajor,$minminor) = split(/\./,$min_script_version);
-       my ($smajor,$sminor) = split(/\./,$client_conf->{script_version});
+       my ($smajor,$sminor) = split(/\./,$cli_ver);
        if ($minmajor > $smajor || ($minmajor == $smajor && $minminor > $sminor))
        {
                print "Status: 460 script version too low\nContent-Type: text/plain\n\n";
@@ -237,18 +239,21 @@ if ($min_script_version)
        }
 }
 
-if ($min_web_script_version)
+if ($min_web_script_version && ! ($client_conf->{script_version} eq 'REL_4.3'))
 {
        $client_conf->{web_script_version} ||= '0.0';
-       my ($minmajor,$minminor) = split(/\./,$min_script_version);
-       my ($smajor,$sminor) = split(/\./,$client_conf->{script_version});
+       my $cli_ver = $client_conf->{web_script_version} ;
+       $cli_ver =~ s/^REL_//;
+       my ($minmajor,$minminor) = split(/\./,$min_web_script_version);
+       my ($smajor,$sminor) = split(/\./,$cli_ver);
        if ($minmajor > $smajor || ($minmajor == $smajor && $minminor > $sminor))
        {
                print "Status: 461 web script version too low\nContent-Type: text/plain\n\n";
                print 
                        "Web Script version is below minimum required\n",
-                       "Reported version: $client_conf->{web_script_version},",
-                       "Minumum version required: $min_web_script_version\n";
+                       "Reported version: $client_conf->{web_script_version}, ",
+                       "Minumum version required: $min_web_script_version\n"
+                       ;
                $db->disconnect;
                exit;
        }