From: Erik Skultety <eskultet@redhat.com>
Date: Fri, 11 Nov 2016 12:39:45 +0000 (+0100)
Subject: vsh: Fix the incorrect environment variable prefix in error message
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=7b8e1dff1af5146db50c78b5b6912aba6f8ea52b;p=libvirt.git

vsh: Fix the incorrect environment variable prefix in error message

Unlike the other error messages in vshInitDebug, this one relied on a hardcoded
name of a variable instead of using the prefix of the tool calling the init
routine.

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1393854

Signed-off-by: Erik Skultety <eskultet@redhat.com>
---

diff --git a/tools/vsh.c b/tools/vsh.c
index f7ba070e67..3ba09ddadb 100644
--- a/tools/vsh.c
+++ b/tools/vsh.c
@@ -3016,8 +3016,8 @@ vshInitDebug(vshControl *ctl)
             int debug;
             if (virStrToLong_i(debugEnv, NULL, 10, &debug) < 0 ||
                 debug < VSH_ERR_DEBUG || debug > VSH_ERR_ERROR) {
-                vshError(ctl, "%s",
-                         _("VSH_DEBUG not set with a valid numeric value"));
+                vshError(ctl, _("%s_DEBUG not set with a valid numeric value"),
+                         ctl->env_prefix);
             } else {
                 ctl->debug = debug;
             }