fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-11 11:50:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

settings: fix wrong assertions for calling nm_settings_connection_replace_settings()

Browse source
This commit is contained in:
Thomas Haller 2014-12-08 19:49:46 +01:00
parent 73703c4d19
commit c2dc5d3b0f
3 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/settings/plugins/ifcfg-rh/plugin.c
View file

@ -342,8 +342,9 @@ connection_new_or_changed (SCPluginIfcfg *self,
FALSE, /* don't set Unsaved */
&error)) {
/* Shouldn't ever get here as 'new' was verified by the reader already */
g_assert_no_error (error);
g_assert_not_reached ();
}
g_assert_no_error (error);
}
g_object_unref (new);

3
src/settings/plugins/ifnet/plugin.c
View file

@ -315,8 +315,9 @@ reload_connections (NMSystemConfigInterface *config)
FALSE, /* don't set Unsaved */
&error)) {
/* Shouldn't ever get here as 'new' was verified by the reader already */
g_assert_no_error (error);
g_assert_not_reached ();
}
g_assert_no_error (error);
nm_log_info (LOGD_SETTINGS, "Connection %s updated",
nm_connection_get_id (NM_CONNECTION (new)));
}

6
src/settings/plugins/keyfile/plugin.c
View file

@ -128,8 +128,9 @@ update_connection (SCPluginKeyfile *self,
FALSE, /* don't set Unsaved */
&error)) {
/* Shouldn't ever get here as 'new' was verified by the reader already */
g_assert_no_error (error);
g_assert_not_reached ();
}
g_assert_no_error (error);
}
g_object_unref (tmp);
}
@ -183,8 +184,9 @@ new_connection (SCPluginKeyfile *self,
FALSE, /* don't set Unsaved */
&error)) {
/* Shouldn't ever get here as 'tmp' was verified by the reader already */
g_assert_no_error (error);
g_assert_not_reached ();
}
g_assert_no_error (error);
g_object_unref (tmp);
if (out_old_path)
*out_old_path = g_strdup (nm_settings_connection_get_filename (connection));