details: http://www.bx.psu.edu/hg/galaxy/rev/ca640ce1abcf changeset: 1598:ca640ce1abcf user: Nate Coraor nate@bx.psu.edu date: Mon Nov 03 15:15:22 2008 -0500 description: Fix a bug: errored jobs weren't actually being deleted.
1 file(s) affected in this change:
lib/galaxy/web/controllers/root.py
diffs (19 lines):
diff -r 21f98b638868 -r ca640ce1abcf lib/galaxy/web/controllers/root.py --- a/lib/galaxy/web/controllers/root.py Mon Nov 03 15:07:22 2008 -0500 +++ b/lib/galaxy/web/controllers/root.py Mon Nov 03 15:15:22 2008 -0500 @@ -281,11 +281,10 @@ if data.parent_id is None and len( data.creating_job_associations ) > 0: # Mark associated job for deletion job = data.creating_job_associations[0].job - if job.state not in [ model.Job.states.QUEUED, model.Job.states.RUNNING, model.Job.states.NEW ]: - return - # Are *all* of the job's other output datasets deleted? - if job.check_if_output_datasets_deleted(): - job.mark_deleted() + if job.state in [ model.Job.states.QUEUED, model.Job.states.RUNNING, model.Job.states.NEW ]: + # Are *all* of the job's other output datasets deleted? + if job.check_if_output_datasets_deleted(): + job.mark_deleted() self.app.model.flush()
@web.expose