|
 |
75f41f |
From 5cff08c4ac6bcb43ac2bc371db189a88c53c8326 Mon Sep 17 00:00:00 2001
|
|
|
75f41f |
From: Aurelien Aptel <aaptel@suse.com>
|
|
|
75f41f |
Date: Wed, 8 Aug 2018 11:38:15 +0200
|
|
|
75f41f |
Subject: [PATCH 06/36] checkopts: report duplicated options in man page
|
|
|
75f41f |
|
|
|
75f41f |
Signed-off-by: Aurelien Aptel <aaptel@suse.com>
|
|
|
75f41f |
(cherry picked from commit 77b028c11fee787d1235a08fd06c8b60d20eb9c0)
|
|
|
75f41f |
Signed-off-by: Sachin Prabhu <sprabhu@redhat.com>
|
|
|
75f41f |
---
|
|
|
75f41f |
checkopts | 19 ++++++++++++++++---
|
|
|
75f41f |
1 file changed, 16 insertions(+), 3 deletions(-)
|
|
|
75f41f |
|
|
|
75f41f |
diff --git a/checkopts b/checkopts
|
|
|
75f41f |
index 26ca271..88e70b1 100755
|
|
|
75f41f |
--- a/checkopts
|
|
|
75f41f |
+++ b/checkopts
|
|
|
75f41f |
@@ -98,9 +98,12 @@ def extract_man_opts(fn):
|
|
|
75f41f |
state = STATE_BASE
|
|
|
75f41f |
rx = RX()
|
|
|
75f41f |
opts = {}
|
|
|
75f41f |
+ ln = 0
|
|
|
75f41f |
|
|
|
75f41f |
with open(fn) as f:
|
|
|
75f41f |
for s in f.readlines():
|
|
|
75f41f |
+ ln += 1
|
|
|
75f41f |
+
|
|
|
75f41f |
if state == STATE_EXIT:
|
|
|
75f41f |
break
|
|
|
75f41f |
|
|
|
75f41f |
@@ -113,7 +116,9 @@ def extract_man_opts(fn):
|
|
|
75f41f |
s = chomp(s)
|
|
|
75f41f |
names = extract_canonical_opts(s)
|
|
|
75f41f |
for name in names:
|
|
|
75f41f |
- opts[name] = s
|
|
|
75f41f |
+ if name not in opts:
|
|
|
75f41f |
+ opts[name] = []
|
|
|
75f41f |
+ opts[name].append({'ln':ln, 'fmt':s})
|
|
|
75f41f |
elif rx.search(r'^[A-Z]+', s):
|
|
|
75f41f |
state = STATE_EXIT
|
|
|
75f41f |
return opts
|
|
|
75f41f |
@@ -174,6 +179,14 @@ def main():
|
|
|
75f41f |
def opt_is_doc(o):
|
|
|
75f41f |
return o in manopts
|
|
|
75f41f |
|
|
|
75f41f |
+ print('DUPLICATED DOC OPTIONS')
|
|
|
75f41f |
+ print('======================')
|
|
|
75f41f |
+
|
|
|
75f41f |
+ for opt in sortedset(man_opts_set):
|
|
|
75f41f |
+ if len(manopts[opt]) > 1:
|
|
|
75f41f |
+ lines = ", ".join([str(x['ln']) for x in manopts[opt]])
|
|
|
75f41f |
+ print("OPTION %-20.20s (lines %s)"%(opt, lines))
|
|
|
75f41f |
+ print()
|
|
|
75f41f |
|
|
|
75f41f |
print('UNDOCUMENTED OPTIONS')
|
|
|
75f41f |
print('====================')
|
|
|
75f41f |
@@ -208,8 +221,8 @@ def main():
|
|
|
75f41f |
unex_opts = man_opts_set - kernel_opts_set
|
|
|
75f41f |
# group opts and their negations together
|
|
|
75f41f |
for opt in sortedset(unex_opts):
|
|
|
75f41f |
- fmt = manopts[opt]
|
|
|
75f41f |
- print('OPTION %s ("%s")' % (opt, fmt))
|
|
|
75f41f |
+ man = manopts[opt][0]
|
|
|
75f41f |
+ print('OPTION %s ("%s") line %d' % (opt, man['fmt'], man['ln']))
|
|
|
75f41f |
|
|
|
75f41f |
|
|
|
75f41f |
print('')
|
|
|
75f41f |
--
|
|
|
75f41f |
1.8.3.1
|
|
|
75f41f |
|