almet/dangerzone
1
0
Fork 0
mirror of https://github.com/freedomofpress/dangerzone.git synced 2025-05-17 02:31:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

FIXUP: use proc_stderr when needed

Browse source
This commit is contained in:
Alexis Métaireau 2025-01-13 16:15:10 +01:00
parent 3b961e6b90
commit f6a616f23b
No known key found for this signature in database
GPG key ID: C65C7A89A8FFC56E
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dangerzone/isolation_provider/container.py
View file

@ -125,7 +125,7 @@ class Container(IsolationProvider):
with subprocess.Popen( with subprocess.Popen(
[container_runtime, "image", "ls"], [container_runtime, "image", "ls"],
stdout=subprocess.DEVNULL, stdout=subprocess.DEVNULL,
stderr=self.proc_stderr, stderr=subprocess.PIPE,
startupinfo=get_subprocess_startupinfo(), startupinfo=get_subprocess_startupinfo(),
) as p: ) as p:
_, stderr = p.communicate() _, stderr = p.communicate()
@ -154,7 +154,7 @@ class Container(IsolationProvider):
args, args,
stdin=subprocess.PIPE, stdin=subprocess.PIPE,
stdout=subprocess.PIPE, stdout=subprocess.PIPE,
stderr=subprocess.PIPE, stderr=self.proc_stderr,
startupinfo=startupinfo, startupinfo=startupinfo,
# Start the conversion process in a new session, so that we can later on # Start the conversion process in a new session, so that we can later on
# kill the process group, without killing the controlling script. # kill the process group, without killing the controlling script.