gnue/common/src GConnections.py

[Jason Cater]

CVSROOT:        /home/cvs
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    02/09/07 12:08:01

Modified files:
        common/src     : GConnections.py 

Log message:
        fixed bug in netrc patch; patch causes forms to bomb out if a .netrc 
file doesn't exist

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

Patches:
Index: gnue/common/src/GConnections.py
diff -c gnue/common/src/GConnections.py:1.36 
gnue/common/src/GConnections.py:1.37
*** gnue/common/src/GConnections.py:1.36        Sat Sep  7 11:26:07 2002
--- gnue/common/src/GConnections.py     Sat Sep  7 12:08:01 2002
***************
*** 217,229 ****
          netrcData = netrc.netrc().authenticators(
                "'gnue://%s/'" % connection_name )
          GDebug.printMesg(5, 'Read the user\'s .netrc file')
-       except IOError:
-         pass
- 
-       if (netrcData):
          loginData['_username'] = netrcData[0][1:-1]
          loginData['_password'] = netrcData[2][1:-1]
          GDebug.printMesg(5, 'Found useful stuff for connection %s in the 
user\'s .netrc file' % connection_name)
  
        if (loginData.has_key('username')):
          loginData['_username'] = loginData['username']
--- 217,227 ----
          netrcData = netrc.netrc().authenticators(
                "'gnue://%s/'" % connection_name )
          GDebug.printMesg(5, 'Read the user\'s .netrc file')
          loginData['_username'] = netrcData[0][1:-1]
          loginData['_password'] = netrcData[2][1:-1]
          GDebug.printMesg(5, 'Found useful stuff for connection %s in the 
user\'s .netrc file' % connection_name)
+       except IOError:
+         pass
  
        if (loginData.has_key('username')):
          loginData['_username'] = loginData['username']
***************
*** 247,253 ****
          attempts = 4
  
          GDebug.printMesg(5,'Getting new data connection to %s' % 
connection_name)
!         
          errortext = None
          while attempts:
  
--- 245,251 ----
          attempts = 4
  
          GDebug.printMesg(5,'Getting new data connection to %s' % 
connection_name)
! 
          errortext = None
          while attempts: