From e5da385eef21d7bf1525ad06e981013a5a57f4eb Mon Sep 17 00:00:00 2001 From: Micah Lee Date: Wed, 24 Nov 2021 12:25:45 -0800 Subject: [PATCH] In Windows, suppress extra window from popping up in subprocess --- dangerzone/global_common.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dangerzone/global_common.py b/dangerzone/global_common.py index e3cea96..438dd56 100644 --- a/dangerzone/global_common.py +++ b/dangerzone/global_common.py @@ -430,7 +430,9 @@ class GlobalCommon(object): print("Installing Dangerzone container image...") p = subprocess.Popen( - [self.get_container_runtime(), "load"], stdin=subprocess.PIPE + [self.get_container_runtime(), "load"], + stdin=subprocess.PIPE, + startupinfo=self.get_subprocess_startupinfo(), ) chunk_size = 1024 @@ -473,6 +475,7 @@ class GlobalCommon(object): self.container_name, ], text=True, + startupinfo=self.get_subprocess_startupinfo(), ) found_image_id = found_image_id.strip() @@ -484,7 +487,8 @@ class GlobalCommon(object): print(f"Deleting old dangerzone container image") subprocess.check_output( - [self.get_container_runtime(), "rmi", found_image_id] + [self.get_container_runtime(), "rmi", found_image_id], + startupinfo=self.get_subprocess_startupinfo(), ) return installed