fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-09 04:48:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

settings/keyfile: log reason why re-read connection cannot be normalized

Browse source 
It's a bug either way, but let's log what exactly went wrong.

(cherry picked from commit 1c2c7d3cb7)
This commit is contained in:
Thomas Haller 2019-08-25 13:25:12 +02:00
parent 2958d04238
commit d92ec1d499
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/settings/plugins/keyfile/nms-keyfile-writer.c
View file

@ -337,6 +337,7 @@ _internal_write_connection (NMConnection *connection,
if (out_reread || out_reread_same) { if (out_reread || out_reread_same) {
gs_unref_object NMConnection *reread = NULL; gs_unref_object NMConnection *reread = NULL;
gs_free_error GError *reread_error = NULL;
gboolean reread_same = FALSE; gboolean reread_same = FALSE;
reread = nms_keyfile_reader_from_keyfile (kf_file, path, NULL, profile_dir, FALSE, NULL); reread = nms_keyfile_reader_from_keyfile (kf_file, path, NULL, profile_dir, FALSE, NULL);
@ -344,7 +345,8 @@ _internal_write_connection (NMConnection *connection,
nm_assert (NM_IS_CONNECTION (reread)); nm_assert (NM_IS_CONNECTION (reread));
if ( reread if ( reread
&& !nm_connection_normalize (reread, NULL, NULL, NULL)) { && !nm_connection_normalize (reread, NULL, NULL, &reread_error)) {
nm_log_err (LOGD_SETTINGS, "BUG: failure to normalize profile that we just wrote to disk: %s", reread_error->message);
nm_assert_not_reached (); nm_assert_not_reached ();
g_clear_object (&reread); g_clear_object (&reread);
} }
@ -439,4 +441,3 @@ nms_keyfile_writer_test_connection (NMConnection *connection,
out_reread_same, out_reread_same,
error); error);
} }