r6507 - trunk/gnue-common/src/datasources

[jamest]

Author: jamest
Date: 2004-10-18 14:00:16 -0500 (Mon, 18 Oct 2004)
New Revision: 6507

Modified:
   trunk/gnue-common/src/datasources/GConnections.py
Log:
populate the authenticated username info when .netrc file is in use


Modified: trunk/gnue-common/src/datasources/GConnections.py
===================================================================
--- trunk/gnue-common/src/datasources/GConnections.py   2004-10-18 16:08:35 UTC 
(rev 6506)
+++ trunk/gnue-common/src/datasources/GConnections.py   2004-10-18 19:00:16 UTC 
(rev 6507)
@@ -416,7 +416,7 @@
           connection.connect (authenticator.login (loginData))
         else:
           connection.connect (loginData)
-
+          
       else:
         attempts = 4
 
@@ -433,12 +433,6 @@
                self.getConnectionParameter(connection_base,'comment',''),
                checkFields], errortext))
 
-            # Add to authenticated user list
-            try:
-              self._authenticatedUsers[connection] = loginData['_username']
-            except KeyError:
-              self._authenticatedUsers[connection] = None
-
             # Ask the data object to connect to the database
             if authenticator:
               connection.connect(authenticator.login(loginData))
@@ -469,7 +463,14 @@
             self._loginHandler.destroyLoginDialog()
             tmsg = u_("User canceled the login request.")
             raise Exceptions.LoginError, tmsg
+            
+      # Add to authenticated user list
+      try:
+        self._authenticatedUsers[connection] = loginData['_username']
+      except KeyError:
+        self._authenticatedUsers[connection] = None
 
+
       if self._eventHandler:
         self._eventHandler.dispatchEvent('Connections:Connect',
               name=connection_name, base=connection_base)