External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-21 10:52:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

vsh: Tweak error message for scaled integers

Browse Source 
It was too similar to the non-scaled alternative.

before:
error: Numeric value 'abc' for <size> option is malformed or out of range
after:
error: Scaled numeric value 'abc' for <size> option is malformed or out of range
This commit is contained in:
Peter Krempa 2016-03-17 15:40:43 +01:00
parent 0c8e3b2234
commit b2c9d77b4e
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/virsh-optparse
View File

@ -205,7 +205,7 @@ compare exp-err err || fail=1
# Non-numeric value
cat <<\EOF > exp-err || framework_failure
error: Numeric value 'abc' for <size> option is malformed or out of range
error: Scaled numeric value 'abc' for <size> option is malformed or out of range
EOF
virsh -q -c $test_url setmaxmem test abc >out 2>err && fail=1
test -s out && fail=1
@ -213,7 +213,7 @@ compare exp-err err || fail=1
# Numeric value with invalid suffix
cat <<\EOF > exp-err || framework_failure
error: Numeric value '42WB' for <size> option is malformed or out of range
error: Scaled numeric value '42WB' for <size> option is malformed or out of range
EOF
virsh -q -c $test_url setmaxmem test 42WB >out 2>err && fail=1
test -s out && fail=1
@ -232,7 +232,7 @@ test -s err && fail=1
# Negative numeric value
cat <<\EOF > exp-err || framework_failure
error: Numeric value '-1' for <size> option is malformed or out of range
error: Scaled numeric value '-1' for <size> option is malformed or out of range
EOF
virsh -q -c $test_url setmaxmem test -1 >out 2>err && fail=1
test -s out && fail=1

4
tools/vsh.c
View File

@ -1147,8 +1147,8 @@ vshCommandOptScaledInt(vshControl *ctl, const vshCmd *cmd,
virScaleInteger(value, end, scale, max) < 0)
{
vshError(ctl,
_("Numeric value '%s' for <%s> option is malformed or out of range"),
arg->data, name);
_("Scaled numeric value '%s' for <%s> option is malformed or "
"out of range"), arg->data, name);
ret = -1;
} else {
ret = 1;