This has been applied, thank you


On June 17, 2004 01:54 pm, Christopher Browne wrote:
> This patch addresses the scenario where the output of "psql --version"
> consists of multiple lines such as the following:
>
> psql (PostgreSQL) 7.4.3
> contains support for command-line editing
>
> cvs server: Diffing .
> Index: slony_setup.pl
> ===================================================================
> RCS file: /usr/local/cvsroot/slony1/slony1-engine/tools/slony_setup.pl,v
> retrieving revision 1.5
> diff -c -u -r1.5 slony_setup.pl
> cvs server: conflicting specifications of output style
> --- slony_setup.pl	10 Jun 2004 01:56:20 -0000	1.5
> +++ slony_setup.pl	17 Jun 2004 20:51:43 -0000
> @@ -828,9 +828,10 @@
>  	if (-x $psql) {
>  		open P, "$psql --version |";
>  		while (<P>) {
> -			$_ =~ m/\s+(\d+)\.(\d+)((\w+)||(\.(\d+)))?\s+/;
> -			$pgversion_major = $1;
> -			$pgversion_minor = $2;
> +			if ($_ =~ m/\s+(\d+)\.(\d+)((\w+)||(\.(\d+)))?\s+/) {
> +			    $pgversion_major = $1;
> +			    $pgversion_minor = $2;
> +			}
>  		}
>  		close P;
>  		if ($pgversion_major == 7 && $pgversion_minor >= 3) {

-- 
Darcy Buskermolen
Wavefire Technologies Corp.
ph: 250.717.0200
fx:  250.763.1759
http://www.wavefire.com