From 0845b8727a90768a1a8e6ff389bfe83c2e87d2e9 Mon Sep 17 00:00:00 2001 From: Dinesh G Dutt Date: Wed, 11 Jan 2017 11:33:15 -0800 Subject: [PATCH] tools: Fix unbound newaddr variable, fix too-broad except clauses Ticket: CM-14351 Reviewed By: dwalton Testing Done:attempts to run NCLU test failed, Daniel verified. Uninit variable bug, plus missed adding ValueError to the except clauses in a couple of places. Signed-off-by: Dinesh Dutt --- tools/frr-reload.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/frr-reload.py b/tools/frr-reload.py index d26758ab17..f6ddd35f66 100755 --- a/tools/frr-reload.py +++ b/tools/frr-reload.py @@ -206,6 +206,8 @@ class Config(object): IPNetwork(addr).prefixlen) except ValueError: newaddr = addr + else: + newaddr = addr legestr = re_key_rt.group(5) re_lege = re.search(r'(.*)le\s+(\d+)\s+ge\s+(\d+)(.*)', legestr) @@ -247,7 +249,7 @@ class Config(object): newaddr.prefixlen, re_net.group(2)) newlines.append(line) - except: + except ValueError: # Really this should be an error. Whats a network # without an IP Address following it ? newlines.append(line) @@ -546,7 +548,7 @@ def get_normalized_ipv6_line(line): if not norm_word: try: norm_word = '%s' % IPv6Address(word) - except: + except ValueError: norm_word = word else: norm_word = word