From: Yanqiu Zhang <yanqzhan@redhat.com>
Date: Thu, 25 Aug 2016 02:49:55 +0000 (+0800)
Subject: storage: Delete extra wrap after vol-resize error
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=ed8ba91ef20e85db87dadce0eb7ff3aa15ad88e6;p=libvirt.git

storage: Delete extra wrap after vol-resize error

This patch is to delete the extra wrap "\n" after failed vol-resize
error for both "Failed to change size of volume to" and "Failed to change
size of volume by". For error with wrap, there will be an extra wrap
between two errors, such as:

   (1)# virsh vol-resize --pool default --vol vol-test 5M
        error: Failed to change size of volume 'vol-test' to 5M

        error: invalid argument: Can't shrink capacity below current capacity unless shrink flag explicitly specified

   (2)# virsh vol-resize /var/lib/libvirt/images/volds --shrink --delta 10M
        error: Failed to change size of volume 'volds' by 10M

        error: invalid argument: can't shrink capacity below existing allocation
---

diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c
index b7debc2dd5..f302f9558d 100644
--- a/tools/virsh-volume.c
+++ b/tools/virsh-volume.c
@@ -1128,8 +1128,8 @@ cmdVolResize(vshControl *ctl, const vshCmd *cmd)
         ret = true;
     } else {
         vshError(ctl,
-                 delta ? _("Failed to change size of volume '%s' by %s\n")
-                 : _("Failed to change size of volume '%s' to %s\n"),
+                 delta ? _("Failed to change size of volume '%s' by %s")
+                 : _("Failed to change size of volume '%s' to %s"),
                  virStorageVolGetName(vol), capacityStr);
         ret = false;
     }