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

cli: fix connection delete/monitor

Browse source 
The two commands should apply to all available connections matching
the given name.

Fixes: 717db4fe01
This commit is contained in:
Beniamino Galvani 2016-08-02 16:49:37 +02:00
parent 2adb5fc00f
commit ec6a118f29
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
clients/cli/connections.c
View file

@ -1698,7 +1698,11 @@ get_connection (NmCli *nmc, int *argc, char ***argv, int *pos, GError **error)
_("unknown connection '%s'"), **argv); _("unknown connection '%s'"), **argv);
} }
next_arg (argc, argv); /* If the caller wants multiple results (pos is set) and there are any,
* don't switch to next argument.
*/
if (!pos || !*pos)
next_arg (argc, argv);
return connection; return connection;
} }
@ -8192,10 +8196,6 @@ do_connection_delete (NmCli *nmc, int argc, char **argv)
invalid_cons = g_string_new (NULL); invalid_cons = g_string_new (NULL);
g_string_append_printf (invalid_cons, "'%s', ", *arg_ptr); g_string_append_printf (invalid_cons, "'%s', ", *arg_ptr);
} }
/* Take next argument (if there's no other connection of the same name) */
if (!pos)
next_arg (&arg_num, &arg_ptr);
} }
if (!queue) { if (!queue) {
@ -8310,9 +8310,6 @@ do_connection_monitor (NmCli *nmc, int argc, char **argv)
g_string_printf (nmc->return_text, _("Error: not all connections found.")); g_string_printf (nmc->return_text, _("Error: not all connections found."));
return error->code; return error->code;
} }
/* Take next argument (if there's no other connection of the same name) */
if (!pos)
next_arg (&argc, &argv);
if (nmc->complete) if (nmc->complete)
continue; continue;