mirror of
https://github.com/CumulusNetworks/ifupdown2.git
synced 2024-05-06 15:54:50 +00:00
addons: address: fix merge-indentation issue
Signed-off-by: Julien Fortin <jfortin@nvidia.com>
This commit is contained in:
@ -1079,9 +1079,9 @@ class address(AddonWithIpBlackList, moduleBase):
|
|||||||
self.process_mtu(ifaceobj, ifaceobj_getfunc)
|
self.process_mtu(ifaceobj, ifaceobj_getfunc)
|
||||||
self.up_ipv6_addrgen(ifaceobj)
|
self.up_ipv6_addrgen(ifaceobj)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
hwaddress, old_mac_addr = self.process_hwaddress(ifaceobj)
|
hwaddress, old_mac_addr = self.process_hwaddress(ifaceobj)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
self.log_error('%s: %s' % (ifaceobj.name, str(e)), ifaceobj)
|
self.log_error('%s: %s' % (ifaceobj.name, str(e)), ifaceobj)
|
||||||
|
|
||||||
if addr_method not in ["dhcp", "ppp"]:
|
if addr_method not in ["dhcp", "ppp"]:
|
||||||
|
Reference in New Issue
Block a user