diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2014-10-28 11:46:23 +0100 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2014-11-03 15:40:52 +0100 |
| commit | 0276945fd34bec3f0f39cd3acec8dcc24c6438a9 (patch) | |
| tree | aa7010b17e6c94f4f07541b3d8d821edbbd5d312 | |
| parent | b63f8c80f867ad78367430ece60006a134ada140 (diff) | |
| download | NetworkManager-0276945fd34bec3f0f39cd3acec8dcc24c6438a9.tar.gz | |
cli: Activating an already activated connection fails
The new ActiveConnection starts in UNKNOWN state and we immediately assume
it failed. We should wait for DEACTIVATED or ACTIVATED instead.
https://bugzilla.gnome.org/show_bug.cgi?id=739339
| -rw-r--r-- | clients/cli/connections.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/clients/cli/connections.c b/clients/cli/connections.c index 0901d22720..1d51047ba2 100644 --- a/clients/cli/connections.c +++ b/clients/cli/connections.c @@ -1741,8 +1741,7 @@ active_connection_state_cb (NMActiveConnection *active, GParamSpec *pspec, gpoin nm_object_get_path (NM_OBJECT (active))); g_object_unref (active); quit (); - } else if ( state == NM_ACTIVE_CONNECTION_STATE_DEACTIVATED - || state == NM_ACTIVE_CONNECTION_STATE_UNKNOWN) { + } else if (state == NM_ACTIVE_CONNECTION_STATE_DEACTIVATED) { g_string_printf (nmc->return_text, _("Error: Connection activation failed.")); nmc->return_value = NMC_RESULT_ERROR_CON_ACTIVATION; g_object_unref (active); |