gnue/common/src GConnections.py

[Jason Cater]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    02/09/17 16:41:27

Modified files:
        common/src     : GConnections.py 

Log message:
        hopefully a fix to the netrc issue

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/GConnections.py.diff?tr1=1.42&tr2=1.43&r1=text&r2=text

Patches:
Index: gnue/common/src/GConnections.py
diff -c gnue/common/src/GConnections.py:1.42 
gnue/common/src/GConnections.py:1.43
*** gnue/common/src/GConnections.py:1.42        Tue Sep 17 11:45:32 2002
--- gnue/common/src/GConnections.py     Tue Sep 17 16:41:27 2002
***************
*** 242,255 ****
          loginData['_password'] = loginData['password']
          del loginData['password']
  
!       try:
  
          dataObject.connect(loginData)
          GDebug.printMesg(5, 'I had enough information to connect to %s 
without asking the user' % connection_name)
          # Save the newly opened connection for future datasources
          self._openConnections[connection_name] = 
dataObject.getDataConnection()
  
!       except GDataObjects.LoginError:
          attempts = 4
  
          GDebug.printMesg(5,'Getting new data connection to %s' % 
connection_name)
--- 242,262 ----
          loginData['_password'] = loginData['password']
          del loginData['password']
  
! 
!       haveAllInformation = 1
!       for rf, dummy1, dummy2 in dataObject.getLoginFields():
!         if not (loginData.has_key(rf) and loginData[rf] != None):
!           haveAllInformation = 0
!           break
! 
!       if haveAllInformation:
  
          dataObject.connect(loginData)
          GDebug.printMesg(5, 'I had enough information to connect to %s 
without asking the user' % connection_name)
          # Save the newly opened connection for future datasources
          self._openConnections[connection_name] = 
dataObject.getDataConnection()
  
!       else:
          attempts = 4
  
          GDebug.printMesg(5,'Getting new data connection to %s' % 
connection_name)