Skip to content

S
slapos.core
Commit a884850a authored by Marco Mariani's avatar Marco Mariani
Browse files
Options

Revert "Fix ipv4 netmask error when run slapformat in the Cygwin" 

This reverts commit 06ebfdb7.
parent 09495a5c
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
slapos/format.py
View file @ a884850a
...@@ -844,8 +844,8 @@ class Interface(object): ...@@ -844,8 +844,8 @@ class Interface(object):
def addIPv4LocalAddress(self, addr=None): def addIPv4LocalAddress(self, addr=None):
"""Adds local IPv4 address in ipv4_local_network""" """Adds local IPv4 address in ipv4_local_network"""
netmask = str(netaddr.IPNetwork(self.ipv4_local_network).netmask) \ netmask = self.ipv4_local_network if sys.platform == 'cygwin' \
if sys.platform == 'cygwin' else '255.255.255.255' else '255.255.255.255'
local_address_list = self.getIPv4LocalAddressList() local_address_list = self.getIPv4LocalAddressList()
if addr is None: if addr is None:
return self._generateRandomIPv4Address(netmask) return self._generateRandomIPv4Address(netmask)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7