From e54da1b6b39baadded02a28382bb6efb70e687c1 Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Tue, 23 Mar 2021 08:49:25 +0100 Subject: [PATCH] mklog: fix test_mklog.py tests. contrib/ChangeLog: * mklog.py: Fix broken tests. --- contrib/mklog.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/contrib/mklog.py b/contrib/mklog.py index 00a001e..1604f05 100755 --- a/contrib/mklog.py +++ b/contrib/mklog.py @@ -65,13 +65,13 @@ PATCH must be generated using diff(1)'s -up or -cp options """ script_folder = os.path.realpath(__file__) -gcc_root = os.path.dirname(os.path.dirname(script_folder)) +root = os.path.dirname(os.path.dirname(script_folder)) def find_changelog(path): folder = os.path.split(path)[0] while True: - if os.path.exists(os.path.join(args.directory, folder, 'ChangeLog')): + if os.path.exists(os.path.join(root, folder, 'ChangeLog')): return folder folder = os.path.dirname(folder) if folder == '': @@ -277,7 +277,7 @@ if __name__ == '__main__': help='Do not generate function names in ChangeLogs') parser.add_argument('-p', '--fill-up-bug-titles', action='store_true', help='Download title of mentioned PRs') - parser.add_argument('-d', '--directory', default=gcc_root, + parser.add_argument('-d', '--directory', help='Root directory where to search for ChangeLog ' 'files') parser.add_argument('-c', '--changelog', @@ -288,6 +288,8 @@ if __name__ == '__main__': args = parser.parse_args() if args.input == '-': args.input = None + if args.directory: + root = args.directory data = open(args.input) if args.input else sys.stdin if args.update_copyright: -- 2.7.4