From 34e3c3acf383e0c58cc2be02b307c9173134265e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Fri, 22 Dec 2017 03:49:44 +0100 Subject: [PATCH] imgconverter: fix handling explicit file type Fix handling source filename as 'type:path' - get parts, not try to extract only the first one. Related QubesOS/qubes-issues#3085 --- imgconverter/qubesimgconverter/__init__.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/imgconverter/qubesimgconverter/__init__.py b/imgconverter/qubesimgconverter/__init__.py index 55ed840..abf6bdc 100644 --- a/imgconverter/qubesimgconverter/__init__.py +++ b/imgconverter/qubesimgconverter/__init__.py @@ -250,9 +250,8 @@ get_from_stream(), get_from_vm(), get_xdg_icon_from_vm(), get_through_dvm()''' '''Master end of image filter: writes untrusted image to stdout and expects header+RGBA on stdin. This method is invoked from qvm-imgconverter-client.''' - filetype = None if ':' in filename: - filetype, filename = filename.split(':', 1)[0] + filetype, filename = filename.split(':', 1) sys.stdout.write('{0}:-\n'.format(filetype)) else: sys.stdout.write('-\n')