Skip to content

Commit de193cd

Browse files
committed
[#3678] ./tools/check-messages.py -g now prints a warning if premium is missing
1 parent 7226bdc commit de193cd

File tree

2 files changed

+13
-5
lines changed

2 files changed

+13
-5
lines changed

doc/sphinx/debug-messages.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
..
2-
File generated by "./tools/check-messages.py -a". Do not edit by hand.
2+
File generated by "./tools/check-messages.py -g". Do not edit by hand.
33
44
Messages printed on debuglevel 0
55
================================

tools/check-messages.py

+12-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env python3
22

3-
# Copyright (C) 2024 Internet Systems Consortium, Inc. ("ISC")
3+
# Copyright (C) 2024-2025 Internet Systems Consortium, Inc. ("ISC")
44
#
55
# This Source Code Form is subject to the terms of the Mozilla Public
66
# License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -160,13 +160,13 @@ def generate_page_with_messages_printed_on_each_debug_level(messages, debug_leve
160160
content.append(subtitle)
161161
content.append('=' * len(subtitle))
162162
content.append('\n')
163-
for message_id, message in messages_at_this_log_level:
163+
for message_id, _ in messages_at_this_log_level:
164164
content.append(f'- {message_id}')
165165
content.append('\n')
166166
parent_dir = os.path.dirname(os.path.realpath(os.path.abspath(sys.argv[0])))
167167
with open(f'{parent_dir}/../doc/sphinx/debug-messages.rst', 'w', encoding='utf-8') as f:
168168
f.write('..\n')
169-
f.write(' File generated by "./tools/check-messages.py -a". Do not edit by hand.\n\n')
169+
f.write(' File generated by "./tools/check-messages.py -g". Do not edit by hand.\n\n')
170170
for i in content:
171171
f.write(i)
172172
f.write('\n')
@@ -334,7 +334,15 @@ def main():
334334
debug_levels[level] = int(debug_levels[level])
335335

336336
if args.autofix or args.generate_debug_messages_page:
337-
generate_page_with_messages_printed_on_each_debug_level(messages, debug_levels)
337+
parent_dir = os.path.dirname(os.path.realpath(os.path.abspath(sys.argv[0])))
338+
if os.path.isdir(os.path.realpath(f'{parent_dir}/../premium')):
339+
generate_page_with_messages_printed_on_each_debug_level(messages, debug_levels)
340+
else:
341+
print('WARNING: Not generating debug-messages.rst. Premium is missing. '
342+
'It would result in incomplete generated content.', file=sys.stderr)
343+
if args.autofix:
344+
failure = True
345+
338346
if args.generate_debug_messages_page:
339347
return
340348

0 commit comments

Comments
 (0)