diff options
| author | Thomas Haller <thaller@redhat.com> | 2017-09-12 16:01:19 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2017-09-12 16:02:39 +0200 |
| commit | 6ad53975b32c895876966d5b0204462fe9b87f88 (patch) | |
| tree | 8b7628ff0b0b58570d720bdafaeee5e28b38e28b | |
| parent | 3c84dd15e066e2a7e309c408563456c2396dfc15 (diff) | |
| download | NetworkManager-6ad53975b32c895876966d5b0204462fe9b87f88.tar.gz | |
cli: fix _set_fcn_gobject_int_impl() to accept nick for setting int property
Fixes: e086cf1887c9ed27da1ad2fc31f4a6a007fc6721
| -rw-r--r-- | clients/common/nm-meta-setting-desc.c | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c index 54fe3b0c16..c520a92652 100644 --- a/clients/common/nm-meta-setting-desc.c +++ b/clients/common/nm-meta-setting-desc.c @@ -944,21 +944,22 @@ _set_fcn_gobject_int_impl (const NMMetaPropertyInfo *property_info, g_return_val_if_reached (FALSE); } - if (!has_value) + if (!has_value) { v = _nm_utils_ascii_str_to_int64 (value, base, min, max, 0); - if ((errsv = errno) != 0) { - if (errsv == ERANGE) { - g_set_error (error, NM_UTILS_ERROR, NM_UTILS_ERROR_INVALID_ARGUMENT, - _("'%s' is out of range [%lli, %lli]"), - value, - (long long) min, - (long long) max); - } else { - g_set_error (error, NM_UTILS_ERROR, NM_UTILS_ERROR_INVALID_ARGUMENT, - _("'%s' is not a valid number"), value); + if ((errsv = errno) != 0) { + if (errsv == ERANGE) { + g_set_error (error, NM_UTILS_ERROR, NM_UTILS_ERROR_INVALID_ARGUMENT, + _("'%s' is out of range [%lli, %lli]"), + value, + (long long) min, + (long long) max); + } else { + g_set_error (error, NM_UTILS_ERROR, NM_UTILS_ERROR_INVALID_ARGUMENT, + _("'%s' is not a valid number"), value); + } + return FALSE; } - return FALSE; } g_value_init (&gval, pspec->value_type); |