From 5b1fffafcdbeb3472a428d6b85f851c4de201dac Mon Sep 17 00:00:00 2001 From: Julien Fortin Date: Mon, 2 Jul 2018 12:20:07 +0200 Subject: [PATCH] addons: addressvirtual: error in VRR mac address changes exit code (1) $ ifquery -a auto bridge iface bridge bridge-vlan-aware yes bridge-ports swp1 auto bridge.2 iface bridge.2 address-virtual 01:01:01:02:02:02 1.10.10.10/32 $ ifup -a error: bridge.2: Multicast bit is set in the virtual mac address '01:01:01:02:02:02' $ echo $? 1 $ Reviewed-by: Roopa Prabhu Signed-off-by: Julien Fortin --- ifupdown2/addons/addressvirtual.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ifupdown2/addons/addressvirtual.py b/ifupdown2/addons/addressvirtual.py index 052d76b..9c0cb7d 100644 --- a/ifupdown2/addons/addressvirtual.py +++ b/ifupdown2/addons/addressvirtual.py @@ -378,10 +378,11 @@ class addressvirtual(moduleBase): mac = mac.lower() try: if int(mac.split(":")[0], 16) & 1 : - self.logger.error("%s: Multicast bit is set in the virtual mac address '%s'" %(ifaceobj.name, mac)) + self.log_error("%s: Multicast bit is set in the virtual mac address '%s'" + % (ifaceobj.name, mac), ifaceobj=ifaceobj) return False return True - except Exception: + except ValueError: return False def _fixup_vrf_enslavements(self, ifaceobj, ifaceobj_getfunc=None):