0x2620/openmedialibrary
1
0
Fork 0
Code Issues 131 Pull requests Releases Wiki Activity

fix local ip discovery on 15.04

Browse source
This commit is contained in:
j 2016-01-07 16:40:22 +05:30
parent 5294a0cb50
commit b188f702d6
1 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
oml/utils.py
View file

@ -271,7 +271,21 @@ def get_local_ipv4():
dev = local[0].split(' ')[4] dev = local[0].split(' ')[4]
local_ip = [l for l in stdout.split('\n') local_ip = [l for l in stdout.split('\n')
if dev in l and not 'default' in l and 'src' in l] if dev in l and not 'default' in l and 'src' in l]
ip = [p for p in local_ip[0].split(' ')[1:] if '.' in p][0] if local_ip:
local_ip = [p for p in local_ip[0].split(' ')[1:] if '.' in p]
if local_ip:
ip = local_ip[0]
if not ip:
cmd = ['ip', 'addr', 'show']
p = subprocess.Popen(cmd, stdout=subprocess.PIPE, close_fds=True)
stdout, stderr = p.communicate()
stdout = stdout.decode('utf-8')
parts = stdout.split(' ')
local_ip = [p for p in parts if dev in p]
if local_ip:
local_ip = re.compile('inet (\d+\.\d+\.\d+.\d+)').findall(local_ip[0])
if local_ip:
ip = local_ip[0]
return ip return ip
def update_dict(root, data): def update_dict(root, data):