system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-10-15 04:24:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

libnm: merge branch 'bg/libnm-activation-stuck-rh1367752'

Browse source 
https://bugzilla.redhat.com/show_bug.cgi?id=1367752
This commit is contained in:
Beniamino Galvani 2016-09-09 16:50:19 +02:00
parent eb7e2e4cd6 79a357b07a
commit aae26ebed3
2 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
clients/cli/connections.c
View file

@ -2178,6 +2178,10 @@ active_connection_state_cb (NMActiveConnection *active, GParamSpec *pspec, Activ
g_print (_("Connection successfully activated (D-Bus active path: %s)\n"),
nm_object_get_path (NM_OBJECT (active)));
activate_connection_info_finish (info);
} 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;
activate_connection_info_finish (info);
} else if (state == NM_ACTIVE_CONNECTION_STATE_ACTIVATING) {
/* activating master connection does not automatically activate any slaves, so their
* active connection state will not progress beyond ACTIVATING state.

23
libnm/nm-object.c
View file

@ -488,14 +488,29 @@ create_async_complete (GObject *object, NMObjectTypeAsyncData *async_data)
static void
create_async_inited (GObject *object, GAsyncResult *result, gpointer user_data)
{
NMObjectPrivate *priv = NM_OBJECT_GET_PRIVATE (object);
NMObjectPrivate *odata_priv;
NMObjectTypeAsyncData *async_data = user_data;
GError *error = NULL;
ObjectCreatedData *odata;
NM_OBJECT_GET_PRIVATE (object)->inited = TRUE;
priv->inited = TRUE;
if (!g_async_initable_init_finish (G_ASYNC_INITABLE (object), result, &error)) {
dbgmsg ("Could not create object for %s: %s",
nm_object_get_path (NM_OBJECT (object)),
error->message);
while (priv->waiters) {
odata = priv->waiters->data;
odata_priv = NM_OBJECT_GET_PRIVATE (odata->self);
priv->waiters = g_slist_remove (priv->waiters, odata);
if (!odata_priv->reload_error)
odata_priv->reload_error = g_error_copy (error);
odata_priv->reload_remaining--;
reload_complete (odata->self, FALSE);
}
g_error_free (error);
g_clear_object (&object);
}
@ -503,15 +518,13 @@ create_async_inited (GObject *object, GAsyncResult *result, gpointer user_data)
create_async_complete (object, async_data);
if (object) {
NMObjectPrivate *priv = NM_OBJECT_GET_PRIVATE (object);
/* There are some object properties whose creation couldn't proceed
* because it depended on this object. */
while (priv->waiters) {
ObjectCreatedData *odata = priv->waiters->data;
odata = priv->waiters->data;
priv->waiters = g_slist_remove (priv->waiters, odata);
object_property_maybe_complete (odata);
}
}
}