Changeset 3140

Timestamp:

01/28/07 22:42:07 (18 years ago)

Author:

jerome

Message:

When several instances of PostgreSQL were installed, pksetup failed
to modify the correct configuration files. This fixes this problem
by asking for each PostgreSQL configuration directory found if this
is the one to modify or not.

Location:

pykota/trunk

Files:

• bin/pksetup (modified) (1 diff)
• NEWS (modified) (1 diff)

pykota/trunk/bin/pksetup

@@ -300 +300 @@
     def configurePostgreSQL(self) :
         """Configures PostgreSQL for PyKota to work."""
-        pgconffile = self.confirmPipe("to find PostgreSQL's configuration files", "find /etc -name postgresql.conf 2>/dev/null")
-        if pgconffile is not False :
-            pgconffile = pgconffile.strip()
-            pgconfdir = os.path.split(pgconffile)[0]
-            answer = self.confirmPipe("to see if PostgreSQL accepts TCP/IP connections", "grep ^tcpip_socket %(pgconffile)s" % locals())
-            conflines = pghbaconf.split("\n")
-            if answer is not False :
-                tcpip = answer.strip().lower().endswith("true")
-            else :    
-                tcpip = False
-            if tcpip :    
-                conflines.insert(2, "host\tpykota\tpykotaadmin,pykotauser\t127.0.0.1\t255.255.255.255\tmd5")
-            else :
-                conflines.insert(1, "local\tpykota\tpykotaadmin,pykotauser\t\tmd5")
-            conf = "\n".join(conflines)
-            self.confirmCommand("to configure PostgreSQL correctly for PyKota", 'echo "%(conf)s" >%(pgconfdir)s/pg_hba.conf' % locals())
-            self.confirmCommand("to make PostgreSQL take the changes into account", self.pgrestart)
-            return tcpip
+        pgconffiles = self.confirmPipe("to find PostgreSQL's configuration files", "find /etc -name postgresql.conf 2>/dev/null")
+        if pgconffiles is not False :
+            pgconffiles = [part.strip() for part in pgconffiles.split()]
+            pgconfdirs = [os.path.split(pgconffile)[0] for pgconffile in pgconffiles]
+            for i in range(len(pgconfdirs)) :
+                pgconfdir = pgconfdirs[i]
+                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())
+                    conflines = pghbaconf.split("\n")
+                    if answer is not False :
+                        tcpip = answer.strip().lower().endswith("true")
+                    else :    
+                        tcpip = False
+                    if tcpip :    
+                        conflines.insert(2, "host\tpykota\tpykotaadmin,pykotauser\t127.0.0.1\t255.255.255.255\tmd5")
+                    else :
+                        conflines.insert(1, "local\tpykota\tpykotaadmin,pykotauser\t\tmd5")
+                    conf = "\n".join(conflines)
+                    self.confirmCommand("to configure PostgreSQL correctly for PyKota", 'echo "%(conf)s" >%(pgconfdir)s/pg_hba.conf' % locals())
+                    self.confirmCommand("to make PostgreSQL take the changes into account", self.pgrestart)
+                    return tcpip
         return None    
         

pykota/trunk/NEWS

@@ -24 +24 @@
     - 1.26alpha2 (2007-01-18) :
     
+        - Fixed a problem with pksetup when several instances of PostgreSQL
+          were installed.
+          
+        - Fixed a failure in edpykota to cleanly delete non existing entries.
+        
         - Fixed email headers.