freifunk/ffmap-backend
8
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #53 from mweinelt/master

Browse source 
batman: prefix sudo for batctl if not executed as root
This commit is contained in:
Nils Schneider 2015-04-12 19:13:16 +02:00
parent 9a652c429c 7322a14274
commit 5a891c1232
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lib/batman.py
View file

@ -1,5 +1,6 @@
import subprocess import subprocess
import json import json
import os
import re import re
@ -46,8 +47,10 @@ class Batman(object):
Parse "batctl -m <mesh_interface> gwl -n" Parse "batctl -m <mesh_interface> gwl -n"
into an array of dictionaries. into an array of dictionaries.
""" """
output = subprocess.check_output( cmd = ['batctl', '-m', self.mesh_interface, 'gwl', '-n']
['batctl', '-m', self.mesh_interface, 'gwl', '-n']) if os.geteuid() > 0:
cmd.insert(0, 'sudo')
output = subprocess.check_output(cmd)
output_utf8 = output.decode('utf-8') output_utf8 = output.decode('utf-8')
rows = output_utf8.splitlines() rows = output_utf8.splitlines()
@ -73,8 +76,10 @@ class Batman(object):
Parse "batctl -m <mesh_interface> gw" Parse "batctl -m <mesh_interface> gw"
return: tuple mode, bandwidth, if mode != server then bandwidth is None return: tuple mode, bandwidth, if mode != server then bandwidth is None
""" """
output = subprocess.check_output( cmd = ['batctl', '-m', self.mesh_interface, 'gw']
['batctl', '-m', self.mesh_interface, 'gw']) if os.geteuid() > 0:
cmd.insert(0, 'sudo')
output = subprocess.check_output(cmd)
chunks = output.decode("utf-8").split() chunks = output.decode("utf-8").split()
return chunks[0], chunks[3] if 3 in chunks else None return chunks[0], chunks[3] if 3 in chunks else None