Revision df0fb067

b/lib/jqueue.py
359 359

  
360 360
            queue.acquire()
361 361
            try:
362
              if op.status == constants.OP_STATUS_CANCELED:
363
                raise CancelJob()
362 364
              assert op.status == constants.OP_STATUS_QUEUED
363 365
              job.run_op_index = idx
364 366
              op.status = constants.OP_STATUS_WAITLOCK
......
1120 1122
    """
1121 1123
    try:
1122 1124
      for op in job.ops:
1123
        op.status = constants.OP_STATUS_ERROR
1125
        op.status = constants.OP_STATUS_CANCELED
1124 1126
        op.result = "Job canceled by request"
1125 1127
    finally:
1126 1128
      self.UpdateJobUnlocked(job)

Also available in: Unified diff