|
|
@ -287,12 +287,12 @@ def runOsCommand(cmd, inStr=None, ret_first=None, env_dict=None):
|
|
|
|
if inStr:
|
|
|
|
if inStr:
|
|
|
|
fin.write(inStr)
|
|
|
|
fin.write(inStr)
|
|
|
|
fin.close()
|
|
|
|
fin.close()
|
|
|
|
|
|
|
|
# Код возврата
|
|
|
|
|
|
|
|
retcode = pipe.wait()
|
|
|
|
res = fout.readlines()
|
|
|
|
res = fout.readlines()
|
|
|
|
fout.close()
|
|
|
|
fout.close()
|
|
|
|
res += ferr.readlines()
|
|
|
|
res += ferr.readlines()
|
|
|
|
ferr.close()
|
|
|
|
ferr.close()
|
|
|
|
# Код возврата
|
|
|
|
|
|
|
|
retcode = pipe.wait()
|
|
|
|
|
|
|
|
if res:
|
|
|
|
if res:
|
|
|
|
if len(res) == 1 or ret_first:
|
|
|
|
if len(res) == 1 or ret_first:
|
|
|
|
return retcode, res[0].strip()
|
|
|
|
return retcode, res[0].strip()
|
|
|
|