diff options
| author | Beniamino Galvani <bgalvani@redhat.com> | 2016-03-10 10:18:41 +0100 |
|---|---|---|
| committer | Beniamino Galvani <bgalvani@redhat.com> | 2016-03-10 11:12:02 +0100 |
| commit | f0c6a0315df752dddc21a8daa5282e91b5e499cc (patch) | |
| tree | 5ed57d27862df5a23df69c803772c49592d3d596 /clients | |
| parent | 551c5de120ccde066ce4301dbee258b17406dafa (diff) | |
| download | NetworkManager-f0c6a0315df752dddc21a8daa5282e91b5e499cc.tar.gz | |
cli: prefer 'modify' over 'monitor' when the command is abbreviated
In previous releases 'nmcli connection m' was interpreted as 'modify',
but recently the monitor command was introduced with a higher
priority, changing the behavior when the abbreviated form is
used.
Restore the old behavior.
https://bugzilla.redhat.com/show_bug.cgi?id=1316120
Diffstat (limited to 'clients')
| -rw-r--r-- | clients/cli/connections.c | 4 | ||||
| -rw-r--r-- | clients/cli/nmcli-completion | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/clients/cli/connections.c b/clients/cli/connections.c index d46588696a..b42f14d753 100644 --- a/clients/cli/connections.c +++ b/clients/cli/connections.c @@ -11123,8 +11123,6 @@ do_connections (NmCli *nmc, int argc, char **argv) g_thread_unref (editor_thread); } else if (matches(*argv, "delete") == 0) { nmc->return_value = do_connection_delete (nmc, argc-1, argv+1); - } else if (matches(*argv, "monitor") == 0) { - nmc->return_value = do_connection_monitor (nmc, argc-1, argv+1); } else if (matches(*argv, "reload") == 0) { nmc->return_value = do_connection_reload (nmc, argc-1, argv+1); } else if (matches(*argv, "load") == 0) { @@ -11158,6 +11156,8 @@ do_connections (NmCli *nmc, int argc, char **argv) nmc->return_value = do_connection_import (nmc, temporary, argc, argv); } else if (matches(*argv, "export") == 0) { nmc->return_value = do_connection_export (nmc, argc-1, argv+1); + } else if (matches(*argv, "monitor") == 0) { + nmc->return_value = do_connection_monitor (nmc, argc-1, argv+1); } else { usage (); g_string_printf (nmc->return_text, _("Error: '%s' is not valid 'connection' command."), *argv); diff --git a/clients/cli/nmcli-completion b/clients/cli/nmcli-completion index f8c0298e4a..7f79180f43 100644 --- a/clients/cli/nmcli-completion +++ b/clients/cli/nmcli-completion @@ -1325,7 +1325,7 @@ _nmcli() ;; de|del|dele|delet|delete| \ - m|mo|mon|moni|monit|monito|monitor) + mon|moni|monit|monito|monitor) if [[ ${#words[@]} -eq 3 ]]; then _nmcli_compl_COMMAND_nl "${words[2]}" "$(printf "id\nuuid\npath\n%s" "$(_nmcli_con_show NAME)")" elif [[ ${#words[@]} -gt 3 ]]; then |