Christopher Browne cbbrowne
Thu Jun 17 20:54:33 PDT 2004
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) {
-- 
let name="cbbrowne" and tld="ca.afilias.info" in String.concat "@" [name;tld];;
<http://dev6.int.libertyrms.com/>
Christopher Browne
(416) 673-4124 (land)


More information about the Slony1-general mailing list