From d92ec1d49901e8cb4b2426570d1ddd8679653cd2 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Sun, 25 Aug 2019 13:25:12 +0200 Subject: [PATCH] settings/keyfile: log reason why re-read connection cannot be normalized It's a bug either way, but let's log what exactly went wrong. (cherry picked from commit 1c2c7d3cb740fa9f68612698b7d9e3a5a7e68a2d) --- src/settings/plugins/keyfile/nms-keyfile-writer.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/settings/plugins/keyfile/nms-keyfile-writer.c b/src/settings/plugins/keyfile/nms-keyfile-writer.c index 5fbbb7a1c8..abf11a17e1 100644 --- a/src/settings/plugins/keyfile/nms-keyfile-writer.c +++ b/src/settings/plugins/keyfile/nms-keyfile-writer.c @@ -337,6 +337,7 @@ _internal_write_connection (NMConnection *connection, if (out_reread || out_reread_same) { gs_unref_object NMConnection *reread = NULL; + gs_free_error GError *reread_error = NULL; gboolean reread_same = FALSE; 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)); 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 (); g_clear_object (&reread); } @@ -439,4 +441,3 @@ nms_keyfile_writer_test_connection (NMConnection *connection, out_reread_same, error); } -