(Re #882) Handle errors in get_interfaces
If there is an error in how interfaces are configured (or only one set, like IPv6), the setup command should not error out.
This commit is contained in:
parent
fdf7f3ae6d
commit
62e082a1c7
1 changed files with 4 additions and 0 deletions
4
setup
4
setup
|
@ -467,6 +467,10 @@ class LinuxNetwork(Network):
|
||||||
interface = dict(v4 = {}, v6 = {})
|
interface = dict(v4 = {}, v6 = {})
|
||||||
for v in 'v4', 'v6':
|
for v in 'v4', 'v6':
|
||||||
output = subprocess.Popen(command[v], stdout=subprocess.PIPE).communicate()[0]
|
output = subprocess.Popen(command[v], stdout=subprocess.PIPE).communicate()[0]
|
||||||
|
if not output:
|
||||||
|
# v6 routing may result in
|
||||||
|
# RTNETLINK answers: Invalid argument
|
||||||
|
continue
|
||||||
words = output.split('\n')[0].split()
|
words = output.split('\n')[0].split()
|
||||||
# A valid output starts with the queried address on the first line
|
# A valid output starts with the queried address on the first line
|
||||||
if words[0] == command[v][-1]:
|
if words[0] == command[v][-1]:
|
||||||
|
|
Loading…
Reference in a new issue