From 340542a2f2946fa50b02879bc630032ff547b9f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= Date: Wed, 18 Dec 2013 16:05:37 +0100 Subject: [PATCH] Revert "cli: consider empty value as "*" for "Interface name: " prompt" This reverts commit 3cb0bf6bc06293a224bfda4967457af69be89bfc. It broke 'ifname' being required as a mandatory parameter as decided in https://bugzilla.gnome.org/show_bug.cgi?id=698113 --- cli/src/connections.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/cli/src/connections.c b/cli/src/connections.c index 1fb5f5d656..e357a64ab9 100644 --- a/cli/src/connections.c +++ b/cli/src/connections.c @@ -4578,10 +4578,12 @@ do_connection_add (NmCli *nmc, int argc, char **argv) ifname_mandatory = FALSE; if (!ifname && ifname_mandatory && nmc->ask) - ifname = ifname_ask = nmc_get_user_input (_("Interface name [*]: ")); - if (!ifname && ifname_mandatory) - ifname = ifname_ask = g_strdup ("*"); - + ifname = ifname_ask = nmc_get_user_input (_("Interface name: ")); + if (!ifname && ifname_mandatory) { + g_string_printf (nmc->return_text, _("Error: 'ifname' argument is required.")); + nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; + goto error; + } if (ifname) { if (!nm_utils_iface_valid_name (ifname) && strcmp (ifname, "*") != 0) { g_string_printf (nmc->return_text,