summaryrefslogtreecommitdiff
path: root/buildtools
diff options
context:
space:
mode:
authorUri Simchoni <urisimchoni@gmail.com>2015-05-18 20:40:11 +0300
committerAndrew Bartlett <abartlet@samba.org>2015-05-20 11:19:11 +0200
commit843c373d008cd51940f08a7a291976b6e80a5fbf (patch)
tree371122d04035f87a1efd8e56b84cc30f3cf92d9c /buildtools
parent0dcf5357959d2bc5cb984eb0276684b56477ed62 (diff)
downloadsamba-843c373d008cd51940f08a7a291976b6e80a5fbf.tar.gz
waf: always close cross answers file
When configuring samba for cross-compilation using the cross-answers file, the file is not closed in a couple of cases - fix that. Signed-off-by: Uri Simchoni <urisimchoni@gmail.com> Reviewed-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Alexander Bokovoy <ab@samba.org>
Diffstat (limited to 'buildtools')
-rw-r--r--buildtools/wafsamba/samba_cross.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/buildtools/wafsamba/samba_cross.py b/buildtools/wafsamba/samba_cross.py
index 3838e34ec48..877ead85815 100644
--- a/buildtools/wafsamba/samba_cross.py
+++ b/buildtools/wafsamba/samba_cross.py
@@ -58,8 +58,10 @@ def cross_answer(ca_file, msg):
f.close()
return ANSWER_FAIL
elif ans[0] == '"':
+ f.close()
return (0, ans.strip('"'))
elif ans[0] == "'":
+ f.close()
return (0, ans.strip("'"))
else:
m = re.match('\(\s*(-?\d+)\s*,\s*\"(.*)\"\s*\)', ans)