From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Sat, 13 Jun 2020 14:29:43 +0000 (+0200)
Subject: update-man-rules: properly filter out directives index again
X-Git-Tag: v246-rc1~151^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a2095c06988499ee32e769de78663367495be33a;p=thirdparty%2Fsystemd.git

update-man-rules: properly filter out directives index again

When directives-template.xml was created in 282230882cd0fc49b5377349f2aee22a1c9dd159,
this generator started picking it up. Let's filter it out properly again,
and also simply the filter while at it.
---

diff --git a/tools/update-man-rules.py b/tools/update-man-rules.py
index c404579a2ad..f5db691f3ef 100755
--- a/tools/update-man-rules.py
+++ b/tools/update-man-rules.py
@@ -4,16 +4,13 @@
 from __future__ import print_function
 import collections
 import sys
-import os.path
 import pprint
+from os.path import basename
 from xml_helper import xml_parse
 
 def man(page, number):
     return '{}.{}'.format(page, number)
 
-def xml(file):
-    return os.path.basename(file)
-
 def add_rules(rules, name):
     xml = xml_parse(name)
     # print('parsing {}'.format(name), file=sys.stderr)
@@ -78,9 +75,12 @@ def make_mesonfile(rules, dist_files):
 
 if __name__ == '__main__':
     pages = sys.argv[1:]
+    pages = (p for p in pages
+             if basename(p) not in {
+                     'systemd.directives.xml',
+                     'systemd.index.xml',
+                     'directives-template.xml'})
 
     rules = create_rules(pages)
-    dist_files = (xml(file) for file in pages
-                  if not file.endswith(".directives.xml") and
-                     not file.endswith(".index.xml"))
+    dist_files = (basename(p) for p in pages)
     print(make_mesonfile(rules, dist_files))