From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Thu, 21 Nov 2019 21:02:07 +0000 (+0100)
Subject: man: sort options without "=" in the directives index
X-Git-Tag: v244-rc1~7^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8c6c56c36fa0749a0af9bb6c9075ca01e5154ac6;p=thirdparty%2Fsystemd.git

man: sort options without "=" in the directives index

Some options would appear twice in the index, e.g. --collect= and
--collect. Some man pages use one form, some the other, and the argument
might be mandatory for some commands but not others. Anyway, let's display
them as one entry, to reduce the total number of items listed.
---

diff --git a/tools/make-directive-index.py b/tools/make-directive-index.py
index 5b965f41632..da10575f32b 100755
--- a/tools/make-directive-index.py
+++ b/tools/make-directive-index.py
@@ -187,6 +187,9 @@ def _extract_directives(directive_groups, formatting, page):
                              storvar if klass else storopt)):
             for name in variablelist.iterfind(xpath):
                 text = re.sub(r'([= ]).*', r'\1', name.text).rstrip()
+                if text.startswith('-'):
+                    # for options, merge options with and without mandatory arg
+                    text = text.partition('=')[0]
                 stor[text].append((pagename, section))
                 if text not in formatting:
                     # use element as formatted display