mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-10-15 20:45:32 +00:00
nmcli: merge branch 'bg/nmcli-dev-connect-error'
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1409
This commit is contained in:
commit
718392ef5f
|
@ -2132,9 +2132,10 @@ connected_state_cb(AddAndActivateInfo *info)
|
||||||
_("Hint: \"nmcli dev wifi show-password\" shows the Wi-Fi name and password.\n"));
|
_("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) {
|
} else if (state <= NM_DEVICE_STATE_DISCONNECTED || state >= NM_DEVICE_STATE_DEACTIVATING) {
|
||||||
reason = nm_device_get_state_reason(info->device);
|
reason = nm_device_get_state_reason(info->device);
|
||||||
g_print(_("Error: Connection activation failed: (%d) %s.\n"),
|
g_string_printf(info->nmc->return_text,
|
||||||
reason,
|
_("Error: Connection activation failed: %s."),
|
||||||
gettext(nmc_device_reason_to_string(reason)));
|
gettext(nmc_device_reason_to_string(reason)));
|
||||||
|
info->nmc->return_value = NMC_RESULT_ERROR_CON_ACTIVATION;
|
||||||
} else {
|
} else {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue