From affc4fd3a9a4105911bad461b5710d6635e796ca Mon Sep 17 00:00:00 2001 From: Wojciech Zygmunt Porczyk Date: Tue, 27 May 2014 14:25:33 +0200 Subject: [PATCH] imgconverter.py: really close stdout in get_through_dvm --- core/imgconverter.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/imgconverter.py b/core/imgconverter.py index e9e100e..a371d0f 100755 --- a/core/imgconverter.py +++ b/core/imgconverter.py @@ -25,7 +25,7 @@ Toolkit for secure transfer and conversion of images between Qubes VMs.''' import colorsys import math -import os.path +import os import re import cStringIO as StringIO import subprocess @@ -185,6 +185,8 @@ expects header+RGBA on stdin. This method is invoked from qvm-imgconverter-clien raise Exception('Something went wrong: {0!s}'.format(e)) finally: sys.stdout.close() + # sys.stdout.close() is not enough and documentation is silent about this + os.close(1) return cls.get_from_stream(sys.stdin, **kwargs)