diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2016-11-11 17:42:07 +0100 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2016-11-11 17:42:07 +0100 |
| commit | 9d31d09bcb08d18a28e4397d6d8e3b2434e2d39a (patch) | |
| tree | 67782d623b0a42497b59429c3ca870a6762dc4d4 | |
| parent | 00dbf6e90ab238dc5d8fea52ec82e2b1b5ef5602 (diff) | |
| download | NetworkManager-9d31d09bcb08d18a28e4397d6d8e3b2434e2d39a.tar.gz | |
libnm/manager: don't fail the object if we can't get the permissions
It's not fatal and the NMObject's initialization shouldn't fail. Just
write out a polite warning and leave the permissions in UNKNOWN state.
| -rw-r--r-- | libnm/nm-manager.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/libnm/nm-manager.c b/libnm/nm-manager.c index acff85cbfe..223bc15c72 100644 --- a/libnm/nm-manager.c +++ b/libnm/nm-manager.c @@ -1171,12 +1171,17 @@ static gboolean init_sync (GInitable *initable, GCancellable *cancellable, GError **error) { NMManager *manager = NM_MANAGER (initable); + GError *local_error = NULL; - if (!nm_manager_parent_initable_iface->init (initable, cancellable, error)) - return FALSE; + if (!nm_manager_parent_initable_iface->init (initable, cancellable, error)) { + /* Never happens. */ + g_return_val_if_reached (FALSE); + } - if (!get_permissions_sync (manager, error)) - return FALSE; + if (!get_permissions_sync (manager, &local_error)) { + g_warning ("Unable to get permissions: %s\n", local_error->message); + g_error_free (local_error); + } return TRUE; } |