fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-08 18:18:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

cli: improve error reporting of missing 'ifname' parameter

Browse source 
Example:
before:
$ nmcli c add type gsm con-nameX aaa ifname fsd
Error: 'ifname' argument is required.

now:
$ nmcli c add type gsm con-nameX aaa ifname fsd
Error: mandatory 'ifname' not seen before 'con-nameX'.
This commit is contained in:
Jiří Klimeš 2015-10-23 12:22:36 +02:00
parent b45bd96d89
commit 696a443e98
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
clients/cli/connections.c
View file

@ -6140,15 +6140,20 @@ do_connection_add (NmCli *nmc, int argc, char **argv)
|| strcmp (type, NM_SETTING_VLAN_SETTING_NAME) == 0) || strcmp (type, NM_SETTING_VLAN_SETTING_NAME) == 0)
ifname_mandatory = FALSE; ifname_mandatory = FALSE;
if (!ifname && ifname_mandatory && nmc->ask) {
ifname = ifname_ask = nmc_readline (_("Interface name [*]: "));
if (!ifname)
ifname = ifname_ask = g_strdup ("*");
}
if (!ifname && ifname_mandatory) { if (!ifname && ifname_mandatory) {
g_string_printf (nmc->return_text, _("Error: 'ifname' argument is required.")); if (nmc->ask) {
nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; ifname = ifname_ask = nmc_readline (_("Interface name [*]: "));
goto error; if (!ifname)
ifname = ifname_ask = g_strdup ("*");
} else {
if (!*argv)
g_string_printf (nmc->return_text, _("Error: 'ifname' argument is required."));
else
g_string_printf (nmc->return_text, _("Error: mandatory 'ifname' not seen before '%s'."),
*argv);
nmc->return_value = NMC_RESULT_ERROR_USER_INPUT;
goto error;
}
} }
if (ifname) { if (ifname) {
if (!nm_utils_iface_valid_name (ifname) && strcmp (ifname, "*") != 0) { if (!nm_utils_iface_valid_name (ifname) && strcmp (ifname, "*") != 0) {