feat: add alma9 support and fix: rpm python3 compatibility
This commit is contained in:
parent
efaf81080c
commit
c7a7d23cfc
@ -69,18 +69,13 @@ def shell_run_command(command_str, need_print_all=True, need_print_output=True,
|
||||
stdout=subprocess.PIPE,
|
||||
stderr=subprocess.STDOUT,
|
||||
shell=True,
|
||||
close_fds=True)
|
||||
close_fds=True,
|
||||
universal_newlines=True)
|
||||
while True:
|
||||
data = ps.stdout.readline()
|
||||
if data == b'':
|
||||
if not data:
|
||||
if ps.poll() is not None:
|
||||
break
|
||||
# fix: python2->python3 subprocess shell bug
|
||||
# 2023/09/21 jiangxf
|
||||
try:
|
||||
data = data.decode()
|
||||
except:
|
||||
pass
|
||||
result["return_message"].append(data)
|
||||
|
||||
if not need_print_all:
|
||||
|
Loading…
x
Reference in New Issue
Block a user