> -----Original Message----- > From: selinux-owner@xxxxxxxxxxxxxxx [mailto:selinux-owner@xxxxxxxxxxxxxxx] > On Behalf Of Nicolas Iooss > Sent: Tuesday, May 12, 2020 2:30 PM > To: selinux@xxxxxxxxxxxxxxx > Subject: [PATCH] python/sepolicy: silence new flake8 warnings > > pyflakes 2.2.0 improved the way format strings are analyzed, which triggers new > warnings in flake8: > > python/sepolicy/sepolicy/manpage.py:1046:23: F999 '...' % ... has > unused named argument(s): type > > python/sepolicy/sepolicy/manpage.py:1225:23: F999 '...' % ... has > unused named argument(s): user > > Remove the unused arguments in order to silence these warnings. > > This fixes failures in Travis-CI such as > https://travis-ci.org/github/SELinuxProject/selinux/jobs/686230518#L5153 > > Signed-off-by: Nicolas Iooss <nicolas.iooss@xxxxxxx> > --- > 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 442608191cc8..3e8a3be907e3 100755 > --- a/python/sepolicy/sepolicy/manpage.py > +++ b/python/sepolicy/sepolicy/manpage.py > @@ -1074,7 +1074,7 @@ If you wanted to change the default user mapping to > use the %(user)s_u user, you > > .B semanage login -m -s %(user)s_u __default__ > > -""" % {'desc': self.desc, 'type': self.type, 'user': self.domainname, 'range': > self._get_users_range()}) > +""" % {'desc': self.desc, 'user': self.domainname, 'range': > +self._get_users_range()}) > > if "login_userdomain" in self.attributes and "login_userdomain" in > self.all_attributes: > self.fd.write(""" > @@ -1245,7 +1245,7 @@ Execute the following to see the types that the SELinux > user %(type)s can execut > > .B $ sesearch -A -s %(type)s -c process -p transition > > -""" % {'user': self.domainname, 'type': self.type}) > +""" % {'type': self.type}) > > def _role_header(self): > self.fd.write('.TH "%(user)s_selinux" "8" "%(user)s" "mgrepl@xxxxxxxxxx" > "%(user)s SELinux Policy documentation"' > -- > 2.26.2 I just hit this issue in the CI, good timing. Acked-by: William Roberts <william.c.roberts@xxxxxxxxx>
