From b4fe3b7cd97df2360b49b8bcf3b7f065384519a3 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Mon, 3 Nov 2014 21:22:09 +0100 Subject: [PATCH] libnm: Drop a wrong assert An active connection object could disappear from the bus before its removal from NMManager:active-connections is signalled -- don't assert it's gone from there already. Here /o/fd/NM/ActiveConnection/81 disappears shortly after it's added: libnm-Message: PC: (0x9ebd088) NMManager:active-connections => '['/org/freedesktop/NetworkManager/ActiveConnection/81', '/org/freedesktop/NetworkManager/ActiveConnection/80']' (ao / NMActiveConnection) libnm-Message: PC: (0x9ebd088) NMManager:activating-connection => ''/'' (o / NMActiveConnection) libnm-Message: PC: (0x9ed1458) NMDeviceTeam:state => '110' (u) libnm-Message: PC: (0x9ed1458) NMDeviceTeam:state-reason => '(110, 0)' ((uu)) libnm-Message: PC: (0x9ece9a0) NMActiveConnection:state => '3' (u) libnm-Message: PC: (0x9ebd088) NMManager:state => '20' (u) libnm-Message: PC: (0x9ebd088) NMManager:devices => '['/org/freedesktop/NetworkManager/Devices/0', '/org/freedesktop/NetworkManager/Devices/2', '/org/freedesktop/NetworkManager/Devices/3']' (ao / NMDevice) libnm-Message: PC: (0x9ebd088) NMManager:active-connections => '['/org/freedesktop/NetworkManager/ActiveConnection/81', '/org/freedesktop/NetworkManager/ActiveConnection/80']' (ao / NMActiveConnection) libnm-Message: PC: (0x9ece9a0) NMActiveConnection:state => '4' (u) libnm-Message: PC: (0x9ece9a0) NMActiveConnection:devices => '[]' (ao / NMDevice) libnm-Message: Could not create object for /org/freedesktop/NetworkManager/ActiveConnection/81: Method "GetAll" with signature "s" on interface "org.freedesktop.DBus.Properties" doesn't exist (process:18042): libnm-CRITICAL **: object_creation_failed: assertion 'find_active_connection_by_path (self, failed_path) == NULL' failed --- libnm/nm-manager.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libnm/nm-manager.c b/libnm/nm-manager.c index d60845edc9..8d78d221bc 100644 --- a/libnm/nm-manager.c +++ b/libnm/nm-manager.c @@ -1043,8 +1043,6 @@ object_creation_failed (NMObject *object, const char *failed_path) GError *error; GSList *iter; - g_return_if_fail (find_active_connection_by_path (self, failed_path) == NULL); - /* A newly activated connection failed due to some immediate error * and disappeared from active connection list. Make sure the * callback gets called.