Merge pull request #645 from sfromm/issue643

Skip get_ipv6_facts if socket.has_ipv6 is false
This commit is contained in:
Michael DeHaan 2012-07-20 17:30:08 -07:00
commit a33713234c

View file

@ -482,6 +482,8 @@ class LinuxNetwork(Network):
self.facts[iface]['ipv4']['network'] = socket.inet_ntoa(struct.pack("!L", ip & mask)) self.facts[iface]['ipv4']['network'] = socket.inet_ntoa(struct.pack("!L", ip & mask))
def get_ipv6_facts(self): def get_ipv6_facts(self):
if not socket.has_ipv6:
return
data = get_file_content('/proc/net/if_inet6') data = get_file_content('/proc/net/if_inet6')
if data is None: if data is None:
return return