Ensure that dbus string param isn't null
An alert's level can be None, but DBUS doesn't allow that for string parameters. Resolves: https://github.com/fedora-selinux/setroubleshoot/pull/27
This commit is contained in:
parent
89d148b7e2
commit
6143dd987f
@ -0,0 +1,26 @@
|
|||||||
|
From a1d303150b341d6cfdc1f7d36c38004cee01fdb7 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Dominik Perpeet <dperpeet@redhat.com>
|
||||||
|
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
|
||||||
|
|
@ -7,6 +7,8 @@ Group: Applications/System
|
|||||||
URL: https://fedorahosted.org/setroubleshoot
|
URL: https://fedorahosted.org/setroubleshoot
|
||||||
Source0: https://fedorahosted.org/releases/s/e/setroubleshoot/%{name}-%{version}.tar.gz
|
Source0: https://fedorahosted.org/releases/s/e/setroubleshoot/%{name}-%{version}.tar.gz
|
||||||
Source1: %{name}.tmpfiles
|
Source1: %{name}.tmpfiles
|
||||||
|
# https://github.com/fedora-selinux/setroubleshoot/pull/27
|
||||||
|
Patch1: 0001-setroubleshoot-Ensure-that-dbus-string-param-isn-t-n.patch
|
||||||
BuildRequires: perl-XML-Parser
|
BuildRequires: perl-XML-Parser
|
||||||
BuildRequires: libcap-ng-devel
|
BuildRequires: libcap-ng-devel
|
||||||
BuildRequires: intltool gettext python3 python3-devel
|
BuildRequires: intltool gettext python3 python3-devel
|
||||||
@ -75,6 +77,7 @@ fi
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
%patch1 -p 2
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure PYTHON=%{__python3}
|
%configure PYTHON=%{__python3}
|
||||||
|
Loading…
Reference in New Issue
Block a user