diff options
| author | Beniamino Galvani <bgalvani@redhat.com> | 2022-10-04 10:07:33 +0200 |
|---|---|---|
| committer | Beniamino Galvani <bgalvani@redhat.com> | 2022-10-04 10:07:33 +0200 |
| commit | 718392ef5ff484f6b77b3088417a52ef90331a83 (patch) | |
| tree | 694207ac7a4d777f7bbe6eb022d1cc2cc297619c | |
| parent | 88f5e7518a6451708ec8dd04373a3f2a045e4dab (diff) | |
| parent | 1a77108dcb68b156682ad776156b4e12f3c37bb7 (diff) | |
nmcli: merge branch 'bg/nmcli-dev-connect-error'
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1409
| -rw-r--r-- | src/nmcli/devices.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/nmcli/devices.c b/src/nmcli/devices.c index dbba6bb61c..b449383034 100644 --- a/src/nmcli/devices.c +++ b/src/nmcli/devices.c @@ -2132,9 +2132,10 @@ connected_state_cb(AddAndActivateInfo *info) _("Hint: \"nmcli dev wifi show-password\" shows the Wi-Fi name and password.\n")); } else if (state <= NM_DEVICE_STATE_DISCONNECTED || state >= NM_DEVICE_STATE_DEACTIVATING) { reason = nm_device_get_state_reason(info->device); - g_print(_("Error: Connection activation failed: (%d) %s.\n"), - reason, - gettext(nmc_device_reason_to_string(reason))); + g_string_printf(info->nmc->return_text, + _("Error: Connection activation failed: %s."), + gettext(nmc_device_reason_to_string(reason))); + info->nmc->return_value = NMC_RESULT_ERROR_CON_ACTIVATION; } else { return; } |