You are viewing a plain text version of this content. The canonical link for it is here.
Posted to general@gump.apache.org by aj...@apache.org on 2003/12/05 05:41:05 UTC

cvs commit: jakarta-gump/python/gump/utils tools.py

ajack       2003/12/04 20:41:05

  Modified:    python/gump/utils tools.py
  Log:
  Bug forever growing work name
  
  Revision  Changes    Path
  1.6       +5 -4      jakarta-gump/python/gump/utils/tools.py
  
  Index: tools.py
  ===================================================================
  RCS file: /home/cvs/jakarta-gump/python/gump/utils/tools.py,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- tools.py	3 Dec 2003 18:36:13 -0000	1.5
  +++ tools.py	5 Dec 2003 04:41:05 -0000	1.6
  @@ -91,13 +91,14 @@
       try:
           if os.path.exists(directory) and  os.path.isdir(directory):
               for fileName in os.listdir(directory):
  +                baseName=name    
                   file=os.path.abspath(os.path.join(directory,fileName))                
                   if os.path.exists(file) and os.path.isfile(file):
  -                    if name: 
  -                        name=name+'_'+fileName
  +                    if baseName: 
  +                        workName=baseName+'_'+fileName
                       else:
  -                        name=fileName
  -                    catFileAsWork(workable,	file, name)
  +                        workName=fileName
  +                    catFileAsWork(workable,	file, workName)
       except:
           try:
               workable.addWarning('No such directory [' + str(directory) + ']')