Further improve return messages

This commit is contained in:
Joshua Boniface 2023-10-17 12:53:08 -04:00
parent 67b0b19bca
commit 3d12915989
1 changed files with 11 additions and 7 deletions

View File

@ -1458,12 +1458,16 @@ def backup_vm(
ttot = round(tend - tstart, 2)
if is_snapshot_remove_failed:
return (
True,
f'WARNING: Successfully backed up VM {domain} ({backup_type} @ {datestring}) to {target_path} in {ttot} seconds, but failed to remove snapshot as requested for volume(s) {", ".join(which_snapshot_remove_failed)}: {", ".join(msg_snapshot_remove_failed)}',
retmsg = (
f"WARNING: Successfully backed up VM '{domain}' ({backup_type} @ {datestring}) to '{target_path}' in {ttot} seconds, but failed to remove snapshot as requested for volume(s) {', '.join(which_snapshot_remove_failed)}: {', '.join(msg_snapshot_remove_failed)}",
)
elif retain_snapshots:
retmsg = (
f"Successfully backed up VM '{domain}' ({backup_type} @ {datestring}, snapshots retained) to '{target_path}' in {ttot} seconds.",
)
else:
retmsg = (
f"Successfully backed up VM '{domain}' ({backup_type} @ {datestring}) to '{target_path}' in {ttot} seconds.",
)
return (
True,
f"Successfully backed up VM {domain} ({backup_type} @ {datestring}) to {target_path} in {ttot} seconds.",
)
return (True, retmsg)