From 4f560f75a23ff8e790623cb2e5c3375b83108296 Mon Sep 17 00:00:00 2001 From: Stefan Sauer Date: Mon, 15 May 2017 20:55:57 +0200 Subject: [PATCH] mkdb: fix porting issue with number of files scanned --- gtkdoc-mkdb.in | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gtkdoc-mkdb.in b/gtkdoc-mkdb.in index c988a49..025556b 100755 --- a/gtkdoc-mkdb.in +++ b/gtkdoc-mkdb.in @@ -3684,7 +3684,9 @@ def ReadSourceDocumentation(source_dir): logging.info("Skipping source directory: %s", source_dir) return else: - logging.info("No match for: %s", (m1.group(1) or source_dir)) + logging.info("No match for: %s", m1.group(1)) + else: + logging.info("No match for: %s", source_dir) logging.info("Scanning source directory: %s", source_dir) @@ -3702,7 +3704,7 @@ def ReadSourceDocumentation(source_dir): subdirs.append(fname) elif SOURCE_SUFFIXES: for suffix in suffix_list: - if ifile.endswith(suffix): + if ifile.endswith("." + suffix): ScanSourceFile(fname) elif re.search(r'\.[ch]$', ifile): ScanSourceFile(fname) @@ -3730,7 +3732,7 @@ def ScanSourceFile(ifile): if m1: m2 = re.search(r'(\s|^)%s(\s|$)' % re.escape(m1.group(1)), IGNORE_FILES) if m2: - logging.info("Skipping source file: ", ifile) + logging.info("Skipping source file: %s", ifile) return m = re.search(r'^.*[\/\\]([^\/\\]*)$', ifile) -- 2.11.4.GIT