cqrenet/relay
3
0
Fork 0
mirror of https://github.com/chatmail/relay.git synced 2026-05-10 16:04:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

make sure subprocesses by defaulit don't inherit stdin FD

Browse Source
This commit is contained in:
holger krekel
2026-03-10 10:54:27 +01:00
parent da5c248562
commit dcb9fbe73f
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmdeploy/src/cmdeploy/lxc/incus.py
View File

@@ -128,7 +128,7 @@ class Incus:
proc = subprocess.Popen( proc = subprocess.Popen(
cmd, cmd,
text=True, text=True,
stdin=subprocess.PIPE if input else None, stdin=subprocess.PIPE if input else subprocess.DEVNULL,
stdout=subprocess.PIPE, stdout=subprocess.PIPE,
stderr=subprocess.STDOUT, stderr=subprocess.STDOUT,
) )

2
cmdeploy/src/cmdeploy/util.py
View File

@@ -90,6 +90,7 @@ class Out:
cmd, cmd,
shell=True, shell=True,
text=True, text=True,
stdin=subprocess.DEVNULL,
stdout=subprocess.PIPE, stdout=subprocess.PIPE,
stderr=subprocess.STDOUT, stderr=subprocess.STDOUT,
env=env, env=env,
@@ -133,6 +134,7 @@ def shell(cmd, check=False, **kwargs):
""" """
if "capture_output" not in kwargs and "stdout" not in kwargs: if "capture_output" not in kwargs and "stdout" not in kwargs:
kwargs["capture_output"] = True kwargs["capture_output"] = True
kwargs.setdefault("stdin", subprocess.DEVNULL)
return subprocess.run(collapse(cmd), shell=True, text=True, check=check, **kwargs) return subprocess.run(collapse(cmd), shell=True, text=True, check=check, **kwargs)