提交 f284ee54 编写于 作者: E Erik Skultety 提交者: Eric Blake

virsh: fix keepalive error msg

resolves https://bugzilla.redhat.com/show_bug.cgi?id=1132305:

The error message for an out-of-range argument was confusing:

virsh -k 9999999999
error: option --k requires a positive numeric argument

After this patch, it is:

error: Invalid value for option -k
Signed-off-by: NEric Blake <eblake@redhat.com>
上级 cabebc0c
...@@ -3470,18 +3470,32 @@ vshParseArgv(vshControl *ctl, int argc, char **argv) ...@@ -3470,18 +3470,32 @@ vshParseArgv(vshControl *ctl, int argc, char **argv)
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
break; break;
case 'k': case 'k':
if (virStrToLong_i(optarg, NULL, 0, &keepalive) < 0 || if (virStrToLong_i(optarg, NULL, 0, &keepalive) < 0) {
keepalive < 0) { vshError(ctl,
vshError(ctl, _("option %s requires a positive numeric argument"), _("Invalid value for option %s"),
longindex == -1 ? "-k" : "--keepalive-interval");
exit(EXIT_FAILURE);
}
if (keepalive < 0) {
vshError(ctl,
_("option %s requires a positive integer argument"),
longindex == -1 ? "-k" : "--keepalive-interval"); longindex == -1 ? "-k" : "--keepalive-interval");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
ctl->keepalive_interval = keepalive; ctl->keepalive_interval = keepalive;
break; break;
case 'K': case 'K':
if (virStrToLong_i(optarg, NULL, 0, &keepalive) < 0 || if (virStrToLong_i(optarg, NULL, 0, &keepalive) < 0) {
keepalive < 0) { vshError(ctl,
vshError(ctl, _("option %s requires a positive numeric argument"), _("Invalid value for option %s"),
longindex == -1 ? "-K" : "--keepalive-count");
exit(EXIT_FAILURE);
}
if (keepalive < 0) {
vshError(ctl,
_("option %s requires a positive integer argument"),
longindex == -1 ? "-K" : "--keepalive-count"); longindex == -1 ? "-K" : "--keepalive-count");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册