Fix Rawhide build

This commit is contained in:
Lubomir Rintel 2018-08-11 11:13:19 +02:00
parent 1117a6f1f7
commit ac2eac23f7
2 changed files with 29 additions and 2 deletions

View File

@ -0,0 +1,27 @@
From 9e31748442e081dfb045bffa703afa8693005ad3 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak@v3.sk>
Date: Sat, 11 Aug 2018 11:08:42 +0200
Subject: [PATCH] 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.
---
shared/nm-utils/nm-test-utils.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/shared/nm-utils/nm-test-utils.h b/shared/nm-utils/nm-test-utils.h
index 743893f03..03d2f73c8 100644
--- a/shared/nm-utils/nm-test-utils.h
+++ b/shared/nm-utils/nm-test-utils.h
@@ -574,7 +574,7 @@ __nmtst_init (int *argc, char ***argv, gboolean assert_logging, const char *log_
} 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);
+ 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)) &&
--
2.17.1

View File

@ -110,7 +110,7 @@ Source3: 20-connectivity-fedora.conf
Source4: 20-connectivity-redhat.conf
Patch0: https://gitlab.freedesktop.org/NetworkManager/NetworkManager/commit/0a3755c179.patch#/0001-version-fix-compile-error-due-to-NM_AVAILABLE_IN_1_1.patch
#Patch1: 0001-some.patch
Patch1: 0001-utils-test-don-t-assert-on-debug-level-messages.patch
Requires(post): systemd
Requires(post): /usr/sbin/update-alternatives
@ -437,7 +437,7 @@ by nm-connection-editor and nm-applet in a non-graphical environment.
%prep
%setup -q -n NetworkManager-%{real_version}
%patch0 -p1
#%patch1 -p1
%patch1 -p1
%build