Revision fbf0262f lib/cli.py
| b/lib/cli.py | ||
|---|---|---|
| 560 | 560 |
prev_logmsg_serial = max(prev_logmsg_serial, serial) |
| 561 | 561 |
|
| 562 | 562 |
# TODO: Handle canceled and archived jobs |
| 563 |
elif status in (constants.JOB_STATUS_SUCCESS, constants.JOB_STATUS_ERROR): |
|
| 563 |
elif status in (constants.JOB_STATUS_SUCCESS, |
|
| 564 |
constants.JOB_STATUS_ERROR, |
|
| 565 |
constants.JOB_STATUS_CANCELING, |
|
| 566 |
constants.JOB_STATUS_CANCELED): |
|
| 564 | 567 |
break |
| 565 | 568 |
|
| 566 | 569 |
prev_job_info = job_info |
| ... | ... | |
| 572 | 575 |
status, opstatus, result = jobs[0] |
| 573 | 576 |
if status == constants.JOB_STATUS_SUCCESS: |
| 574 | 577 |
return result |
| 578 |
elif status in (constants.JOB_STATUS_CANCELING, |
|
| 579 |
constants.JOB_STATUS_CANCELED): |
|
| 580 |
raise errors.OpExecError("Job was canceled")
|
|
| 575 | 581 |
else: |
| 576 | 582 |
has_ok = False |
| 577 | 583 |
for idx, (status, msg) in enumerate(zip(opstatus, result)): |
Also available in: Unified diff