From: Ryota Ozaki <ozaki.ryota@gmail.com>
Date: Mon, 24 Oct 2011 11:44:04 +0000 (+0900)
Subject: virsh: Fix error message on vol-create-from failure
X-Git-Tag: v0.9.7-rc1~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b5c9936ec9dbbee5a78126024c622652b81dc12;p=thirdparty%2Flibvirt.git

virsh: Fix error message on vol-create-from failure

If vol-create-from is failed due to 'input volume not found',
virsh outputs like this:
  $ sudo virsh vol-create-from testpool test-vol.xml test.img
  error: failed to get vol 'test.img', specifying --pool might help
  error: Storage volume not found: no storage vol with matching path
However, '--pool' is incorrect because it is already specified as
second argument ('testpool' in this case). It should be "--inputpool".

The patch fixes this by using pooloptname, which will be "inputpool"
in this case and "pool" in other cases, as error message.
---

diff --git a/tools/virsh.c b/tools/virsh.c
index 72344f0ba2..5544a41165 100644
--- a/tools/virsh.c
+++ b/tools/virsh.c
@@ -15216,8 +15216,8 @@ vshCommandOptVolBy(vshControl *ctl, const vshCmd *cmd,
         if (pool)
             vshError(ctl, _("failed to get vol '%s'"), n);
         else
-            vshError(ctl, _("failed to get vol '%s', specifying --pool "
-                            "might help"), n);
+            vshError(ctl, _("failed to get vol '%s', specifying --%s "
+                            "might help"), n, pooloptname);
     }
 
     if (pool)