diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2022-03-17 14:11:05 +0100 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2022-03-28 13:29:28 +0200 |
| commit | c7ab380a5cbcf22d943df2ea866649dba97c2806 (patch) | |
| tree | a662930f2c65724a515925f3cd101a25d53f2fe6 | |
| parent | e39e5d9372e6ea40de5596ea4db0e80b645c2cb5 (diff) | |
| download | NetworkManager-c7ab380a5cbcf22d943df2ea866649dba97c2806.tar.gz | |
cli: fix handling of erroneous connections in "delete"
If we can't find a connection for any reason other than that it doesn't
exist, we should error out immediately and consistently, regardless of
whether we already encountered a non-existent connection.
| -rw-r--r-- | src/nmcli/connections.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/nmcli/connections.c b/src/nmcli/connections.c index d964e88db2..9f09fee0c6 100644 --- a/src/nmcli/connections.c +++ b/src/nmcli/connections.c @@ -9132,8 +9132,11 @@ do_connection_delete(const NMCCommand *cmd, NmCli *nmc, int argc, const char *co nmc->return_value = error->code; g_clear_error(&error); - if (nmc->return_value != NMC_RESULT_ERROR_NOT_FOUND) + if (nmc->return_value != NMC_RESULT_ERROR_NOT_FOUND) { + g_string_free(invalid_cons, TRUE); + invalid_cons = NULL; goto finish; + } if (!invalid_cons) invalid_cons = g_string_new(NULL); @@ -9186,7 +9189,6 @@ finish: g_string_printf(nmc->return_text, _("Error: cannot delete unknown connection(s): %s."), invalid_cons->str); - nmc->return_value = NMC_RESULT_ERROR_NOT_FOUND; } } |