From 4b6924a27b0e0da897f3ae41a1bc590417aa37e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Sat, 8 Aug 2015 04:22:05 +0200 Subject: [PATCH] imgconverter: ensure that connection to the VM is properly closed Even in case of some error (for example invalid image). (cherry picked from commit fc3347c91460944905b8593e43a576267f5f7de4) --- core/imgconverter.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/core/imgconverter.py b/core/imgconverter.py index 3873470..1d3d28d 100755 --- a/core/imgconverter.py +++ b/core/imgconverter.py @@ -152,9 +152,10 @@ get_from_stream(), get_from_vm(), get_xdg_icon_from_vm(), get_through_dvm()''' p.stdin.write('{0}\n'.format(src)) p.stdin.close() - img = cls.get_from_stream(p.stdout, **kwargs) - - p.stdout.close() + try: + img = cls.get_from_stream(p.stdout, **kwargs) + finally: + p.stdout.close() if p.wait(): raise Exception('Something went wrong with receiver')