cvs commit: jakarta-gump/python/gump update.py model.py conf.py

[aj...@apache.org]

ajack       2003/10/13 15:37:13

  Modified:    python/gump update.py model.py conf.py
  Log:
  Try not to dork up :ext: when fixing :pserver:
  
  Revision  Changes    Path
  1.17      +5 -5      jakarta-gump/python/gump/update.py
  
  Index: update.py
  ===================================================================
  RCS file: /home/cvs/jakarta-gump/python/gump/update.py,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- update.py	13 Oct 2003 18:51:20 -0000	1.16
  +++ update.py	13 Oct 2003 22:37:12 -0000	1.17
  @@ -92,7 +92,7 @@
   
   # encode a password in the same way that cvs does
   def mangle(passwd):
  -  return 'A' +''.join(map(chr,[shifts[ord(c)] for c in str(passwd or '')]))
  +  return 'A' + ''.join(map(chr,[shifts[ord(c)] for c in str(passwd or '')]))
   
   def update(workspace, expr='*', context=GumpContext()):
           
  @@ -152,7 +152,7 @@
                   except Exception, detail:
                       log.error('Failed to append to ~/.cvspass. Details: ' + str(detail))
               else:
  -                log.warn('Login already available for: ' + str(repository.name) \
  +                log.debug('Login already available for: ' + str(repository.name) \
                       + ' @ ' + root)            
           else:
               log.warn('Unable to provide login for CVS repository: ' + str(repository.name) \
  
  
  
  1.24      +7 -4      jakarta-gump/python/gump/model.py
  
  Index: model.py
  ===================================================================
  RCS file: /home/cvs/jakarta-gump/python/gump/model.py,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- model.py	13 Oct 2003 21:19:03 -0000	1.23
  +++ model.py	13 Oct 2003 22:37:12 -0000	1.24
  @@ -175,7 +175,10 @@
       if repository.root.hostname:
         root+='@'
         if self.cvs['host-prefix']: root+=self.cvs['host-prefix']+'.'
  -      root+=str(repository.root.hostname) + ':2401'
  +      
  +      # :TODO: Allow users to override default port
  +      root+=str(repository.root.hostname) + ':'
  +    if str(repository.root.method)=='pserver': root+='2401'
       root+=str(repository.root.path)
       if self.cvs.dir: root+='/'+str(self.cvs.dir)
   
  
  
  
  1.20      +4 -4      jakarta-gump/python/gump/conf.py
  
  Index: conf.py
  ===================================================================
  RCS file: /home/cvs/jakarta-gump/python/gump/conf.py,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- conf.py	13 Oct 2003 18:51:20 -0000	1.19
  +++ conf.py	13 Oct 2003 22:37:12 -0000	1.20
  @@ -109,7 +109,7 @@
   class setting:    
       """Configuration of hardcoded settings"""
       
  -    version="2.0.1-alpha-0004"
  +    version="2.0.1-alpha-0005"
       
       # :TODO: Add "minimum checks later..."
       ws_version="0.4"