diff options
| author | Thomas Haller <thaller@redhat.com> | 2019-05-15 10:36:54 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2019-05-15 10:37:03 +0200 |
| commit | 7a0e347b38faf56ed1b3a103106199721d75f11c (patch) | |
| tree | 703dbae6fc36c99cdeee8fa8e6d6f9a73f7fb1b7 | |
| parent | 8fcadf532881ce671c999257b1b19260b7e873b5 (diff) | |
| download | NetworkManager-7a0e347b38faf56ed1b3a103106199721d75f11c.tar.gz | |
libnm: don't assert for success of g_dbus_error_register_error()
libnm/tests/test-general statically links against libnm/libnm-utils.la
and dynamically against libnm/libnm.so. Hence, _nm_utils_init() is invoked
twice, failing the assertion.
That is a bug that must be fixed. For now, just don't assert.
| -rw-r--r-- | libnm-core/nm-errors.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libnm-core/nm-errors.c b/libnm-core/nm-errors.c index 5dbbb36d7f..a1d5cc1853 100644 --- a/libnm-core/nm-errors.c +++ b/libnm-core/nm-errors.c @@ -49,8 +49,7 @@ register_error_domain (GQuark domain, nm_assert (e && e->value_nick && !strchr (e->value_nick, '-')); nm_sprintf_buf (error_name, "%s.%s", interface, e->value_nick); - if (!g_dbus_error_register_error (domain, e->value, error_name)) - nm_assert_not_reached (); + g_dbus_error_register_error (domain, e->value, error_name); } } |