1. Daniel Blankenberg
  2. galaxy-central-scratch

Commits

Nate Coraor  committed b729f8f

Bugfix for the previous commit.

  • Participants
  • Parent commits 5f044d4
  • Branches default

Comments (0)

Files changed (3)

File lib/galaxy/jobs/__init__.py

View file
             util.umask_fix_perms( path, self.app.config.umask, 0666, self.app.config.gid )
         self.sa_session.flush()
         log.debug( 'job %d ended' % self.job_id )
-        if self.app.config.cleanup_job in ( 'always', 'onsuccess' ):
+        if self.app.config.cleanup_job == 'always' or ( not stderr and self.app.config.cleanup_job == 'onsuccess' ):
             self.cleanup()
 
     def cleanup( self ):

File lib/galaxy/jobs/runners/drmaa.py

View file
             log.exception("Job wrapper finish method failed")
 
         # clean up the drm files
-        if self.app.config.cleanup_job == "always" or ( not stderr and self.app.config.cleanup_job == "onsuccess" )):
+        if self.app.config.cleanup_job == "always" or ( not stderr and self.app.config.cleanup_job == "onsuccess" ):
             self.cleanup( ( ofile, efile, job_file ) )
 
     def fail_job( self, drm_job_state ):

File lib/galaxy/jobs/runners/pbs.py

View file
             pbs_job_state.job_wrapper.fail("Unable to finish job", exception=True)
 
         # clean up the pbs files
-        if self.app.config.cleanup_job == "always" or ( not stderr and self.app.config.cleanup_job == "onsuccess" )):
+        if self.app.config.cleanup_job == "always" or ( not stderr and self.app.config.cleanup_job == "onsuccess" ):
             self.cleanup( ( ofile, efile, job_file ) )
 
     def fail_job( self, pbs_job_state ):