diff options
| author | Simon McVittie <smcv@debian.org> | 2018-08-22 20:29:44 +0100 |
|---|---|---|
| committer | Simon McVittie <smcv@debian.org> | 2018-08-23 12:34:11 +0100 |
| commit | 2163fa90fba7223b1cfdd8cc4a86ea51134985d4 (patch) | |
| tree | 94e3c8c43eaeeac036f69203f33044ae49da27a5 | |
| parent | e2699ef26e1b56c6318d3129b78fdd646249823a (diff) | |
Apply patch from upstream to fix FTBFS with GLib 2.57
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rw-r--r-- | debian/patches/utils-test-don-t-assert-on-debug-level-messages.patch | 29 |
2 files changed, 30 insertions, 0 deletions
diff --git a/debian/patches/series b/debian/patches/series index 3a4a99fc..7918af1b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,3 +3,4 @@ Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch Don-t-make-NetworkManager-D-Bus-activatable.patch Fix-iscsiadm-path.patch version-fix-compile-error-due-to-NM_AVAILABLE_IN_1_12_2-m.patch +utils-test-don-t-assert-on-debug-level-messages.patch diff --git a/debian/patches/utils-test-don-t-assert-on-debug-level-messages.patch b/debian/patches/utils-test-don-t-assert-on-debug-level-messages.patch new file mode 100644 index 00000000..0a1273a5 --- /dev/null +++ b/debian/patches/utils-test-don-t-assert-on-debug-level-messages.patch @@ -0,0 +1,29 @@ +From: Lubomir Rintel <lkundrak@v3.sk> +Date: Sat, 11 Aug 2018 11:08:42 +0200 +Subject: utils/test: don't assert on debug level messages + +They come and go in GLib core for all sorts of purposes. Don't let that +break our tests. + +(cherry picked from commit 3e8eef538987c909e87b871a6b8c74aee08661a3) +Origin: upstream, 1.12.4, commit:5810c46b118447567e52199ca139c7a5e9be6ab4 +--- + shared/nm-utils/nm-test-utils.h | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/shared/nm-utils/nm-test-utils.h b/shared/nm-utils/nm-test-utils.h +index 743893f..d29e9ae 100644 +--- a/shared/nm-utils/nm-test-utils.h ++++ b/shared/nm-utils/nm-test-utils.h +@@ -573,8 +573,9 @@ __nmtst_init (int *argc, char ***argv, gboolean assert_logging, const char *log_ + #endif + } else { + /* We were called not to set logging levels. This means, that the user +- * expects to assert against (all) messages. Any uncought message is fatal. */ +- g_log_set_always_fatal (G_LOG_LEVEL_MASK); ++ * expects to assert against (all) messages. ++ * Any uncaught message on >debug level is fatal. */ ++ g_log_set_always_fatal (G_LOG_LEVEL_MASK & ~G_LOG_LEVEL_DEBUG); + } + + if ((!__nmtst_internal.assert_logging || (__nmtst_internal.assert_logging && __nmtst_internal.no_expect_message)) && |