diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2019-04-09 08:14:25 +0200 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2019-04-12 17:30:15 +0200 |
| commit | 817b55cf063b8244c2288c39af6a94da475083d9 (patch) | |
| tree | e0f644617d5694de2895fe546bf4dd006c3005cb | |
| parent | 549112c1ba5306dff281ef0788961ac855342d02 (diff) | |
| download | NetworkManager-817b55cf063b8244c2288c39af6a94da475083d9.tar.gz | |
nmcli: fix an error message when the tc qdisc kind is missing
Before:
# nmcli c modify eth666 tc.qdiscs root
Error: failed to modify tc.qdiscs: '(null)' is not a valid kind The valid syntax is: '[root | parent <handle>] [handle <handle>] <qdisc>'.
After:
# nmcli c modify eth666 tc.qdiscs root
Error: failed to modify tc.qdiscs: kind is missing. The valid syntax is: '[root | parent <handle>] [handle <handle>] <kind>'.
| -rw-r--r-- | clients/common/nm-meta-setting-desc.c | 10 | ||||
| -rw-r--r-- | libnm-core/nm-setting-tc-config.c | 30 |
2 files changed, 32 insertions, 8 deletions
diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c index 2b0386265c..1de51dc191 100644 --- a/clients/common/nm-meta-setting-desc.c +++ b/clients/common/nm-meta-setting-desc.c @@ -3580,9 +3580,9 @@ _objlist_set_fcn_tc_config_qdiscs (NMSetting *setting, tc_qdisc = nm_utils_tc_qdisc_from_str (value, &local); if (!tc_qdisc) { nm_utils_error_set (error, NM_UTILS_ERROR_INVALID_ARGUMENT, - "%s %s", + "%s. %s", local->message, - _("The valid syntax is: '[root | parent <handle>] [handle <handle>] <qdisc>'")); + _("The valid syntax is: '[root | parent <handle>] [handle <handle>] <kind>'")); return FALSE; } if (do_add) @@ -3604,7 +3604,7 @@ _objlist_set_fcn_bridge_vlans (NMSetting *setting, vlan = nm_bridge_vlan_from_str (value, &local); if (!vlan) { nm_utils_error_set (error, NM_UTILS_ERROR_INVALID_ARGUMENT, - "%s %s", + "%s. %s", local->message, _("The valid syntax is: '<vid> [pvid] [untagged]")); return FALSE; @@ -3656,9 +3656,9 @@ _objlist_set_fcn_tc_config_tfilters (NMSetting *setting, tc_tfilter = nm_utils_tc_tfilter_from_str (value, &local); if (!tc_tfilter) { nm_utils_error_set (error, NM_UTILS_ERROR_INVALID_ARGUMENT, - "%s %s", + "%s. %s", local->message, - _("The valid syntax is: '[root | parent <handle>] [handle <handle>] <tfilter>'")); + _("The valid syntax is: '[root | parent <handle>] [handle <handle>] <kind>'")); return FALSE; } if (do_add) diff --git a/libnm-core/nm-setting-tc-config.c b/libnm-core/nm-setting-tc-config.c index 7425ae73f4..ebae3b0e2f 100644 --- a/libnm-core/nm-setting-tc-config.c +++ b/libnm-core/nm-setting-tc-config.c @@ -62,7 +62,15 @@ nm_tc_qdisc_new (const char *kind, { NMTCQdisc *qdisc; - if (!kind || !*kind || strchr (kind, ' ') || strchr (kind, '\t')) { + if (!kind || !*kind) { + g_set_error (error, + NM_CONNECTION_ERROR, + NM_CONNECTION_ERROR_INVALID_PROPERTY, + _("kind is missing")); + return NULL; + } + + if (strchr (kind, ' ') || strchr (kind, '\t')) { g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY, @@ -290,7 +298,15 @@ nm_tc_action_new (const char *kind, { NMTCAction *action; - if (!kind || !*kind || strchr (kind, ' ') || strchr (kind, '\t')) { + if (!kind || !*kind) { + g_set_error (error, + NM_CONNECTION_ERROR, + NM_CONNECTION_ERROR_INVALID_PROPERTY, + _("kind is missing")); + return NULL; + } + + if (strchr (kind, ' ') || strchr (kind, '\t')) { g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY, @@ -544,7 +560,15 @@ nm_tc_tfilter_new (const char *kind, { NMTCTfilter *tfilter; - if (!kind || !*kind || strchr (kind, ' ') || strchr (kind, '\t')) { + if (!kind || !*kind) { + g_set_error (error, + NM_CONNECTION_ERROR, + NM_CONNECTION_ERROR_INVALID_PROPERTY, + _("kind is missing")); + return NULL; + } + + if (strchr (kind, ' ') || strchr (kind, '\t')) { g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY, |