diff options
| author | Michael Biebl <biebl@debian.org> | 2013-02-03 14:49:30 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2013-02-03 14:49:30 +0100 |
| commit | 02d69323d320e0df4d7daa6115ee1ac1239b1a58 (patch) | |
| tree | b83a6b9a01b302117d31476361971212f9fd1750 /cli/src/network-manager.c | |
| parent | d31839fb4152978db9734e24c00fbac4f42debb7 (diff) | |
| parent | 9c202e3e860b3be9e1f8882630b69affbb130102 (diff) | |
Merge tag 'upstream/0.9.7.995' into experimental
Upstream version 0.9.7.995
Diffstat (limited to 'cli/src/network-manager.c')
| -rw-r--r-- | cli/src/network-manager.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/cli/src/network-manager.c b/cli/src/network-manager.c index 927eadd1..8fb5f6cf 100644 --- a/cli/src/network-manager.c +++ b/cli/src/network-manager.c @@ -578,10 +578,13 @@ do_network_manager (NmCli *nmc, int argc, char **argv) } } #endif - else if (strcmp (*argv, "help") == 0) { + else if ( matches (*argv, "help") == 0 + || (g_str_has_prefix (*argv, "-") && matches ((*argv)+1, "help") == 0) + || (g_str_has_prefix (*argv, "--") && matches ((*argv)+2, "help") == 0)) { usage (); } else { + usage (); g_string_printf (nmc->return_text, _("Error: 'nm' command '%s' is not valid."), *argv); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; } |