colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "cli: consider empty value as "*" for "Interface name: " prompt"

Browse Source 
This reverts commit 3cb0bf6bc0.
It broke 'ifname' being required as a mandatory parameter as decided in
https://bugzilla.gnome.org/show_bug.cgi?id=698113
This commit is contained in:
Jiří Klimeš
2013-12-18 16:05:37 +01:00
parent d79b56a7e9
commit 340542a2f2
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cli/src/connections.c
View File

@@ -4578,10 +4578,12 @@ do_connection_add (NmCli *nmc, int argc, char **argv)
ifname_mandatory = FALSE; ifname_mandatory = FALSE;
if (!ifname && ifname_mandatory && nmc->ask) if (!ifname && ifname_mandatory && nmc->ask)
ifname = ifname_ask = nmc_get_user_input (_("Interface name [*]: ")); ifname = ifname_ask = nmc_get_user_input (_("Interface name: "));
if (!ifname && ifname_mandatory) if (!ifname && ifname_mandatory) {
ifname = ifname_ask = g_strdup ("*"); g_string_printf (nmc->return_text, _("Error: 'ifname' argument is required."));
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) {
g_string_printf (nmc->return_text, g_string_printf (nmc->return_text,