vikarti.anatra/seafile-containerized
1
0
Fork 0
mirror of https://github.com/ggogel/seafile-containerized.git synced 2024-11-16 09:01:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix subprocess.check_output

Browse source
This commit is contained in:
sniper-py 2020-04-27 09:52:08 +08:00
parent 12319e41b7
commit 2584014969
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
scripts_7.1/utils/__init__.py
View file

@ -144,7 +144,7 @@ def get_process_cmd(pid, env=False):
env = 'e' if env else ''
try:
return subprocess.check_output('ps {} -o command {}'.format(env, pid),
shell=True).strip().splitlines()[1]
shell=True).decode('utf8').strip().splitlines()[1]
# except Exception, e:
# print(e)
except:
@ -153,7 +153,7 @@ def get_process_cmd(pid, env=False):
def get_match_pids(pattern):
pgrep_output = subprocess.check_output(
'pgrep -f "{}" || true'.format(pattern),
shell=True).strip()
shell=True).decode('utf8').strip()
return [int(pid) for pid in pgrep_output.splitlines()]
def ask_for_confirm(msg):
@ -171,7 +171,7 @@ def git_current_commit():
def get_command_output(cmd):
shell = not isinstance(cmd, list)
return str(subprocess.check_output(cmd, shell=shell))
return subprocess.check_output(cmd, shell=shell).decode('utf8')
def ask_yes_or_no(msg, prompt='', default=None):
print('\n' + msg + '\n')