diff --git a/0001-setroubleshoot-Ensure-that-dbus-string-param-isn-t-n.patch b/0001-setroubleshoot-Ensure-that-dbus-string-param-isn-t-n.patch deleted file mode 100644 index 9fdba54..0000000 --- a/0001-setroubleshoot-Ensure-that-dbus-string-param-isn-t-n.patch +++ /dev/null @@ -1,26 +0,0 @@ -From a1d303150b341d6cfdc1f7d36c38004cee01fdb7 Mon Sep 17 00:00:00 2001 -From: Dominik Perpeet -Date: Wed, 6 Apr 2016 10:09:55 +0200 -Subject: [PATCH] setroubleshoot: Ensure that dbus string param isn't null - -An alert's level can be None, but DBUS doesn't allow that for string parameters. ---- - framework/src/setroubleshoot/server.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/framework/src/setroubleshoot/server.py b/framework/src/setroubleshoot/server.py -index 87722c9..e788d41 100755 ---- a/framework/src/setroubleshoot/server.py -+++ b/framework/src/setroubleshoot/server.py -@@ -579,7 +579,7 @@ Return an alert with summary, audit events, fix suggestions - - return (alert.local_id, alert.summary(), alert.report_count, - audit_events, plugins, -- str(alert.first_seen_date), str(alert.last_seen_date), alert.level -+ str(alert.first_seen_date), str(alert.last_seen_date), alert.level or '' - ) - - --- -2.7.3 - diff --git a/0002-framework-Drop-unwanted-debug-message-in-sedispatch.patch b/0002-framework-Drop-unwanted-debug-message-in-sedispatch.patch deleted file mode 100644 index b2f1aeb..0000000 --- a/0002-framework-Drop-unwanted-debug-message-in-sedispatch.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 4271b72e879ca25ba244036c0c2b6b9dbf7b2edf Mon Sep 17 00:00:00 2001 -From: Petr Lautrbach -Date: Thu, 14 Apr 2016 10:36:14 +0200 -Subject: [PATCH 2/2] framework: Drop unwanted debug message in sedispatch - -Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1326985 ---- - framework/src/sedispatch.c | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/framework/src/sedispatch.c b/framework/src/sedispatch.c -index 6417a10..bec3aa9 100644 ---- a/framework/src/sedispatch.c -+++ b/framework/src/sedispatch.c -@@ -147,10 +147,9 @@ int main(int argc __attribute__((unused)), char *argv[] __attribute__((unused))) - FD_SET(0, &rfds); - tv.tv_sec = 3; - tv.tv_usec = 0; -- if (select(1, &rfds, NULL, NULL, &tv) == 0) { -- syslog(LOG_ERR, "timeout flush"); -+ if (select(1, &rfds, NULL, NULL, &tv) == 0) -+ /* The timeout occurred, the event is probably complete */ - auparse_flush_feed(au); -- } - } - if (feof(stdin)) - break; --- -2.7.3 -