imgconverter: ensure that connection to the VM is properly closed

Even in case of some error (for example invalid image).

(cherry picked from commit fc3347c914)
This commit is contained in:
Marek Marczykowski-Górecki 2015-08-08 04:22:05 +02:00
parent 5c6ad4c669
commit 4b6924a27b
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724

View File

@ -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')