Changeset 3290 for pykota/trunk

Timestamp:

01/11/08 23:10:35 (17 years ago)

Author:

jerome

Message:

Fixed a problem where PostgreSQL 8.x wants 'listen_addresses' instead of 'tcpip_socket' in 7.4

Files:

• pykota/trunk/bin/pksetup (modified) (1 diff)

pykota/trunk/bin/pksetup

@@ -305 +305 @@
                 pgconffile = pgconffiles[i]
                 if (len(pgconfdirs) == 1) or self.yesno("Do PostgreSQL configuration files reside in %(pgconfdir)s" % locals()) :
-                    answer = self.confirmPipe("to see if PostgreSQL accepts TCP/IP connections", "grep ^tcpip_socket %(pgconffile)s" % locals())
+                    answer = self.confirmPipe("to see if PostgreSQL accepts TCP/IP connections", 'egrep \\"^tcpip_socket|^listen_addresses\\" %(pgconffile)s' % locals())
                     conflines = pghbaconf.split("\n")
                     if answer is not False :
-                        tcpip = answer.strip().lower().endswith("true")
+                        answer = answer.strip().lower()
+                        tcpip = answer.endswith("true")
+                        if tcpip is False :
+                            tcpip = answer.startswith("listen_addresses")
                     else :    
                         tcpip = False