[libvirt] [PATCH] virsh: don't print --(null) in vol-name and vol-pool

Don't print the pool option name if it's null. Before: virsh # vol-name vol error: failed to get vol 'vol', specifying --(null) might help error: Storage volume not found: no storage vol with matching path vol After: virsh # vol-name vol error: failed to get vol 'vol' error: Storage volume not found: no storage vol with matching path vol Bug: https://bugzilla.redhat.com/show_bug.cgi?id=924571 --- tools/virsh-volume.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c index 89ad8ea..0ca295f 100644 --- a/tools/virsh-volume.c +++ b/tools/virsh-volume.c @@ -88,7 +88,7 @@ vshCommandOptVolBy(vshControl *ctl, const vshCmd *cmd, } if (!vol) { - if (pool) + if (pool || !pooloptname) vshError(ctl, _("failed to get vol '%s'"), n); else vshError(ctl, _("failed to get vol '%s', specifying --%s " -- 1.8.1.5

On 22.03.2013 12:51, Ján Tomko wrote:
Don't print the pool option name if it's null.
Before: virsh # vol-name vol error: failed to get vol 'vol', specifying --(null) might help error: Storage volume not found: no storage vol with matching path vol
After:
virsh # vol-name vol error: failed to get vol 'vol' error: Storage volume not found: no storage vol with matching path vol
Bug: https://bugzilla.redhat.com/show_bug.cgi?id=924571 --- tools/virsh-volume.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c index 89ad8ea..0ca295f 100644 --- a/tools/virsh-volume.c +++ b/tools/virsh-volume.c @@ -88,7 +88,7 @@ vshCommandOptVolBy(vshControl *ctl, const vshCmd *cmd, }
if (!vol) { - if (pool) + if (pool || !pooloptname) vshError(ctl, _("failed to get vol '%s'"), n); else vshError(ctl, _("failed to get vol '%s', specifying --%s "
ACK Michal

On 03/22/2013 12:58 PM, Michal Privoznik wrote:
On 22.03.2013 12:51, Ján Tomko wrote:
Don't print the pool option name if it's null.
Before: virsh # vol-name vol error: failed to get vol 'vol', specifying --(null) might help error: Storage volume not found: no storage vol with matching path vol
After:
virsh # vol-name vol error: failed to get vol 'vol' error: Storage volume not found: no storage vol with matching path vol
Bug: https://bugzilla.redhat.com/show_bug.cgi?id=924571 --- tools/virsh-volume.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
ACK
Michal
Thanks, pushed now. Jan
participants (2)
-
Ján Tomko
-
Michal Privoznik