CVS User Account cvsuser
Wed Aug 4 19:59:45 PDT 2004
Log Message:
-----------
PostgreSQL 7.5 has been renamed to 8.0, make it so that we pass 8.0 version checks

Modified Files:
--------------
    slony1-engine/src/slon:
        dbutils.c (r1.10 -> r1.11)
    slony1-engine/src/slonik:
        slonik.c (r1.28 -> r1.29)
    slony1-engine/tools:
        slony_setup.pl (r1.11 -> r1.12)

-------------- next part --------------
Index: slony_setup.pl
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/tools/slony_setup.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -Ltools/slony_setup.pl -Ltools/slony_setup.pl -u -w -r1.11 -r1.12
--- tools/slony_setup.pl
+++ tools/slony_setup.pl
@@ -74,8 +74,8 @@
 Sometimes a "pg_dump | psql" will generate errors on the psql side.  These
 are not always fatal, but should be looked at.
 
-Add support for detecting pg_dump 7.5 on the master and disabling dollar
-quoting if the slave is less than 7.5.
+Add support for detecting pg_dump 8.0 on the master and disabling dollar
+quoting if the slave is less than 8.0.
 
 Add support for detecting version of slaves to see if they satisfy?
 
@@ -941,7 +941,9 @@
 	}
     }
     close P;
-    if ($major >= 7 && $minor >= 3) {
+    if ($major == 7 && $minor >= 3) {
+	return 0;
+    } elsif ($major == 8) {
 	return 0;
     } else {
 	return 1;


More information about the Slony1-commit mailing list