diff mbox series

[pushed] mklog: fix test_mklog.py tests.

Message ID c023b56c-e2e6-8f5d-09cc-2d2103b0943d@suse.cz
State New
Headers show
Series [pushed] mklog: fix test_mklog.py tests. | expand

Commit Message

Martin Liška March 23, 2021, 7:50 a.m. UTC 
This fixed what I broke in g:c38f679eebffd601d977330f24def69f4b620c93.

Thanks,
Martin

contrib/ChangeLog:

	* mklog.py: Fix broken tests.
---
  contrib/mklog.py | 8 +++++---
  1 file changed, 5 insertions(+), 3 deletions(-)
diff mbox series

Patch

diff --git a/contrib/mklog.py b/contrib/mklog.py
index 00a001ec5ae..1604f0516d0 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: