170610ef88
This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/policycoreutils.git#b96da6593911f3b75a2849b5cf8c90b3e98c2977
47 lines
2.0 KiB
Diff
47 lines
2.0 KiB
Diff
From a7e9864865f3f72f51d943ff5bf684638cc7e921 Mon Sep 17 00:00:00 2001
|
|
From: Ondrej Mosnacek <omosnace@redhat.com>
|
|
Date: Tue, 28 Jul 2020 14:37:13 +0200
|
|
Subject: [PATCH] sepolicy: Fix flake8 warnings in Fedora-only code
|
|
|
|
Fixes:
|
|
$ PATH="$VIRTUAL_ENV/bin:$PATH" ./scripts/run-flake8
|
|
Analyzing 187 Python scripts
|
|
./installdir/usr/lib/python3.8/site-packages/sepolicy/manpage.py:720:20: E713 test for membership should be 'not in'
|
|
./installdir/usr/lib/python3.8/site-packages/sepolicy/manpage.py:774:17: E117 over-indented
|
|
./python/sepolicy/build/lib/sepolicy/manpage.py:720:20: E713 test for membership should be 'not in'
|
|
./python/sepolicy/build/lib/sepolicy/manpage.py:774:17: E117 over-indented
|
|
./python/sepolicy/sepolicy/manpage.py:720:20: E713 test for membership should be 'not in'
|
|
./python/sepolicy/sepolicy/manpage.py:774:17: E117 over-indented
|
|
The command "PATH="$VIRTUAL_ENV/bin:$PATH" ./scripts/run-flake8" exited with 1.
|
|
|
|
Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com>
|
|
---
|
|
python/sepolicy/sepolicy/manpage.py | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/python/sepolicy/sepolicy/manpage.py b/python/sepolicy/sepolicy/manpage.py
|
|
index ffcedb547993..c013c0d48502 100755
|
|
--- a/python/sepolicy/sepolicy/manpage.py
|
|
+++ b/python/sepolicy/sepolicy/manpage.py
|
|
@@ -719,7 +719,7 @@ Default Defined Ports:""")
|
|
for f in self.all_file_types:
|
|
if f.startswith(self.domainname):
|
|
flist.append(f)
|
|
- if not f in self.exec_types or not f in self.entry_types:
|
|
+ if f not in self.exec_types or f not in self.entry_types:
|
|
flist_non_exec.append(f)
|
|
if f in self.fcdict:
|
|
mpaths = mpaths + self.fcdict[f]["regex"]
|
|
@@ -773,7 +773,7 @@ SELinux %(domainname)s policy is very flexible allowing users to setup their %(d
|
|
""" % {'domainname': self.domainname, 'equiv': e, 'alt': e.split('/')[-1]})
|
|
|
|
if flist_non_exec:
|
|
- self.fd.write(r"""
|
|
+ self.fd.write(r"""
|
|
.PP
|
|
.B STANDARD FILE CONTEXT
|
|
|
|
--
|
|
2.30.0
|
|
|