From c0ac97fe6822d783b2e92afa27cf5fbaa6eb64ca Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Thu, 16 Jul 2020 12:28:20 +0200 Subject: qp5_tool.py: Fix reading config files with empty lines Move rstrip() below read check. Change-Id: I56333b813aaa8608296e8f8e3181bacf10d2f63f Reviewed-by: Christian Tismer --- build_scripts/qp5_tool.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'build_scripts') diff --git a/build_scripts/qp5_tool.py b/build_scripts/qp5_tool.py index 6871bb343..7cba8e2b7 100644 --- a/build_scripts/qp5_tool.py +++ b/build_scripts/qp5_tool.py @@ -211,9 +211,10 @@ def read_config_file(file_name): keyPattern = re.compile(r'^\s*([A-Za-z0-9\_\-]+)\s*=\s*(.*)$') with open(file_name) as f: while True: - line = f.readline().rstrip() + line = f.readline() if not line: break + line = line.rstrip() match = keyPattern.match(line) if match: key = match.group(1) -- cgit v1.2.3 From 9a9c65d289fbb80c4868760ed7a9e7a117eca7b6 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Thu, 16 Jul 2020 12:16:50 +0200 Subject: qp5_tool.py: Fix 'clean' mode on Windows Use the relative path for git as git submodule foreach (as invoked by "clean") does not work with spaces in the path on Windows. Change-Id: Ia53e8ef9a48c88fb3159bf961da4798216422f3c Reviewed-by: Christian Tismer --- build_scripts/qp5_tool.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'build_scripts') diff --git a/build_scripts/qp5_tool.py b/build_scripts/qp5_tool.py index 7cba8e2b7..b023fc58f 100644 --- a/build_scripts/qp5_tool.py +++ b/build_scripts/qp5_tool.py @@ -395,8 +395,8 @@ if __name__ == '__main__': argument_parser.print_help() sys.exit(0) - git = which('git') - if git is None: + git = 'git' + if which(git) is None: warnings.warn('Unable to find git', RuntimeWarning) sys.exit(-1) -- cgit v1.2.3