gump-general mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aj...@apache.org
Subject cvs commit: gump/python/gump/build builder.py
Date Tue, 29 Jun 2004 20:06:41 GMT
ajack       2004/06/29 13:06:41

  Modified:    python/gump/build Tag: CleanUp builder.py
  Log:
  Fixed a typo in MkDir.
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.4.2.5   +10 -8     gump/python/gump/build/builder.py
  
  Index: builder.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/build/builder.py,v
  retrieving revision 1.4.2.4
  retrieving revision 1.4.2.5
  diff -u -r1.4.2.4 -r1.4.2.5
  --- builder.py	23 Jun 2004 21:38:43 -0000	1.4.2.4
  +++ builder.py	29 Jun 2004 20:06:41 -0000	1.4.2.5
  @@ -216,7 +216,7 @@
           # Make a directory
           #
           if mkdir.hasDirectory(): 
  -            dirToMake=delete.getDirectory()
  +            dirToMake=mkdir.getDirectory()
               try:
                   if not os.path.exists(dirToMake):
                       os.makedirs(dirToMake)
  @@ -237,8 +237,7 @@
           
           startedOk =  project.okToPerformWork()
               
  -        #
  -        if 0 and project.okToPerformWork():        
  +        if project.okToPerformWork():        
               # Deletes...
               dels=0
               for delete in project.getDeletes():
  @@ -246,8 +245,10 @@
                       self.performDelete(project,delete,dels)
                       dels+=1
                       project.changeState(STATE_SUCCESS)
  -                except:
  -                    log.error('PerformDelete Failed', exc_info=1)
  +                except Exception, details:
  +                    message='Failed to perform delete ' + `delete` + ':' + str(details)
  +                    log.error(message, exc_info=1)
  +                    self.addError(message)
                       project.changeState(STATE_FAILED,REASON_PREBUILD_FAILED)
                   
           if project.okToPerformWork():
  @@ -258,11 +259,12 @@
                       self.performMkDir(project,mkdir,mkdirs)
                       mkdirs+=1
                       project.changeState(STATE_SUCCESS)
  -                except:
  -                    log.error('PerformMkdir Failed', exc_info=1)    
  +                except Exception, details:
  +                    message='Failed to perform mkdir ' + `mkdir` + ':' + str(details)
  +                    log.error(message, exc_info=1)
  +                    self.addError(message)
                       project.changeState(STATE_FAILED,REASON_PREBUILD_FAILED)
        
  -            
           if startedOk and not project.okToPerformWork():
               log.warn('Failed to perform pre-build on project [' + project.getName() + ']')
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: general-unsubscribe@gump.apache.org
For additional commands, e-mail: general-help@gump.apache.org


Mime
View raw message