[libvirt] [PATCH] virsh: fix missing prompt message for 'snapshot-delete' command

Make the command 'virsh snapshot-delete' has the appropriate prompt message when executing sucessful or failed. --- tools/virsh.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index cd17f42..b7cea58 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -11534,8 +11534,12 @@ cmdSnapshotDelete(vshControl *ctl, const vshCmd *cmd) if (snapshot == NULL) goto cleanup; - if (virDomainSnapshotDelete(snapshot, flags) < 0) + if (virDomainSnapshotDelete(snapshot, flags) == 0) { + vshPrint(ctl, _("Domain snapshot %s deleted\n"), name); + } else { + vshError(ctl, _("Failed to delete snapshot %s"), name); goto cleanup; + } ret = true; -- 1.7.4.4

于 2011年07月13日 16:36, Nan Zhang 写道:
Make the command 'virsh snapshot-delete' has the appropriate prompt message when executing sucessful or failed. --- tools/virsh.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/tools/virsh.c b/tools/virsh.c index cd17f42..b7cea58 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -11534,8 +11534,12 @@ cmdSnapshotDelete(vshControl *ctl, const vshCmd *cmd) if (snapshot == NULL) goto cleanup;
- if (virDomainSnapshotDelete(snapshot, flags)< 0)
You can keep this line unchanged, and switch the prompt strings for failure and success. But it's fine, ACK
+ if (virDomainSnapshotDelete(snapshot, flags) == 0) { + vshPrint(ctl, _("Domain snapshot %s deleted\n"), name); + } else { + vshError(ctl, _("Failed to delete snapshot %s"), name); goto cleanup; + }
ret = true;

On 07/13/2011 06:51 AM, Osier Yang wrote:
于 2011年07月13日 16:36, Nan Zhang 写道:
Make the command 'virsh snapshot-delete' has the appropriate prompt message when executing sucessful or failed.
- if (virDomainSnapshotDelete(snapshot, flags)< 0)
You can keep this line unchanged, and switch the prompt strings for failure and success. But it's fine, ACK
+ if (virDomainSnapshotDelete(snapshot, flags) == 0) { + vshPrint(ctl, _("Domain snapshot %s deleted\n"), name); + } else { + vshError(ctl, _("Failed to delete snapshot %s"), name); goto cleanup; + }
I didn't see any reason to reorder things. I added Nan to AUTHORS and pushed; let me know if I need to adjust any spellings. -- Eric Blake eblake@redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org
participants (3)
-
Eric Blake
-
Nan Zhang
-
Osier Yang