r6239 - trunk/gnue-appserver/src/gcd

[johannes]

Author: johannes
Date: 2004-09-02 04:46:27 -0500 (Thu, 02 Sep 2004)
New Revision: 6239

Modified:
   trunk/gnue-appserver/src/gcd/readgcd.py
Log:
Don't ignore username and password from connections.conf


Modified: trunk/gnue-appserver/src/gcd/readgcd.py
===================================================================
--- trunk/gnue-appserver/src/gcd/readgcd.py     2004-09-02 09:34:36 UTC (rev 
6238)
+++ trunk/gnue-appserver/src/gcd/readgcd.py     2004-09-02 09:46:27 UTC (rev 
6239)
@@ -358,9 +358,18 @@
 
     connection = self.connections.getConnection (self.OPTIONS ['connection'])
 
-    connection.parameters ['username'] = self.OPTIONS ['username'] or "gnue"
-    connection.parameters ['password'] = self.OPTIONS ['password'] or "gnue"
 
+    if not connection.parameters.has_key ('username'):
+      connection.parameters ['username'] = 'gnue'
+    if not connection.parameters.has_key ('password'):
+      connection.parameters ['password'] = 'gnue'
+
+    if self.OPTIONS ['username'] is not None:
+      connection.parameters ['username'] = self.OPTIONS ['username']
+
+    if self.OPTIONS ['password'] is not None:
+      connection.parameters ['password'] = self.OPTIONS ['password']
+
     self.connections.loginToConnection (connection)
 
     print _("Updating schema ...")