From 718bc4bcdf7a9f9d5654f843a38bc208fca78598 Mon Sep 17 00:00:00 2001 From: Vit Mojzis Date: Fri, 3 Mar 2017 10:52:56 +0100 Subject: [PATCH] python/sepolicy: fix obtaining domain name in HTMLManPages HTMLManPages got domain name by splitting name of selinux manpage on "_selinux" which doesn't work properly when domain name contains "_selinux". Signed-off-by: Vit Mojzis --- python/sepolicy/sepolicy/manpage.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/python/sepolicy/sepolicy/manpage.py b/python/sepolicy/sepolicy/manpage.py index 773a9aba..1af4295c 100755 --- a/python/sepolicy/sepolicy/manpage.py +++ b/python/sepolicy/sepolicy/manpage.py @@ -205,12 +205,12 @@ class HTMLManPages: for domain in self.manpage_domains.values(): if len(domain): for d in domain: - convert_manpage_to_html((self.new_path + d.split("_selinux")[0] + ".html"), self.old_path + d) + convert_manpage_to_html((self.new_path + d.rsplit("_selinux", 1)[0] + ".html"), self.old_path + d) for role in self.manpage_roles.values(): if len(role): for r in role: - convert_manpage_to_html((self.new_path + r.split("_selinux")[0] + ".html"), self.old_path + r) + convert_manpage_to_html((self.new_path + r.rsplit("_selinux", 1)[0] + ".html"), self.old_path + r) def _gen_index(self): index = self.old_path + "index.html" @@ -290,7 +290,7 @@ Fedora or Red Hat Enterprise Linux Man Pages. if len(self.manpage_roles[letter]): rolename_body += "

" for r in self.manpage_roles[letter]: - rolename = r.split("_selinux")[0] + rolename = r.rsplit("_selinux", 1)[0] rolename_body += "%s_selinux(8) - Security Enhanced Linux Policy for the %s SELinux user\n" % (letter, rolename, rolename, rolename) fd.write("""%s @@ -317,7 +317,7 @@ Fedora or Red Hat Enterprise Linux Man Pages. if len(self.manpage_domains[letter]): domainname_body += "

" for r in self.manpage_domains[letter]: - domainname = r.split("_selinux")[0] + domainname = r.rsplit("_selinux", 1)[0] domainname_body += "%s_selinux(8) - Security Enhanced Linux Policy for the %s SELinux processes\n" % (letter, domainname, domainname, domainname) fd.write("""%s