storm/fenrir
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into processing

Browse Source
This commit is contained in:
chrys 2017-07-26 22:42:55 +02:00
commit 3ff29e89da
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/fenrir/commands/commands/subprocess.py
View File

@ -36,9 +36,11 @@ class command():
callstring = self.scriptPath + ' ' + self.env['general']['currUser'] callstring = self.scriptPath + ' ' + self.env['general']['currUser']
p = Popen(callstring , stdout=PIPE, stderr=PIPE, shell=True) p = Popen(callstring , stdout=PIPE, stderr=PIPE, shell=True)
stdout, stderr = p.communicate() stdout, stderr = p.communicate()
stdout = stdout.decode('utf-8')
stderr = stderr.decode('utf-8')
self.env['runtime']['outputManager'].interruptOutput() self.env['runtime']['outputManager'].interruptOutput()
if stderr != '': if stderr != '':
self.env['runtime']['outputManager'].presentText(str(stdout) , soundIcon='', interrupt=False) self.env['runtime']['outputManager'].presentText(str(stderr) , soundIcon='', interrupt=False)
if stdout != '': if stdout != '':
self.env['runtime']['outputManager'].presentText(str(stdout) , soundIcon='', interrupt=False) self.env['runtime']['outputManager'].presentText(str(stdout) , soundIcon='', interrupt=False)
except Exception as e: except Exception as e: