copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

revert bad commit from [8817]. fixes #3443

This commit is contained in:
Yann Leboulanger 2007-09-16 21:27:11 +00:00
parent 6667eb5e29
commit df13453388
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/common/helpers.py
View File

@ -722,10 +722,11 @@ def get_os_info():
full_path_to_executable = is_in_path(executable, return_abs_path = True) full_path_to_executable = is_in_path(executable, return_abs_path = True)
if full_path_to_executable: if full_path_to_executable:
command = executable + params command = executable + params
p = Popen([command], shell=True, stdin=subprocess.PIPE, child_stdin, child_stdout = os.popen2(command)
stdout=subprocess.PIPE, close_fds=True) output = temp_failure_retry(child_stdout.readline).strip()
p.wait() child_stdout.close()
output = temp_failure_retry(p.stdout.readline).strip() child_stdin.close()
os.wait()
# some distros put n/a in places, so remove those # some distros put n/a in places, so remove those
output = output.replace('n/a', '').replace('N/A', '') output = output.replace('n/a', '').replace('N/A', '')
return output return output