aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2020-07-16 12:28:20 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2020-07-16 14:45:47 +0200
commitc0ac97fe6822d783b2e92afa27cf5fbaa6eb64ca (patch)
tree1f8206124260b53f50b1d6eefdc5cae439daa932
parent3ea38f5dd7c58e968f775e6c85af729ab34a7071 (diff)
qp5_tool.py: Fix reading config files with empty lines
Move rstrip() below read check. Change-Id: I56333b813aaa8608296e8f8e3181bacf10d2f63f Reviewed-by: Christian Tismer <tismer@stackless.com>
-rw-r--r--build_scripts/qp5_tool.py3
1 files changed, 2 insertions, 1 deletions
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)