From 04832c4525d0b35dc3f1d48e64a632b26f120639 Mon Sep 17 00:00:00 2001 From: Sapan Bhatia Date: Fri, 18 Mar 2011 15:21:21 -0400 Subject: [PATCH] Generate an error, not exception when an unknown tag is used --- plugins/vsys.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/plugins/vsys.py b/plugins/vsys.py index 6d0ad6c..b836dc5 100644 --- a/plugins/vsys.py +++ b/plugins/vsys.py @@ -88,13 +88,16 @@ def writeAcls(currentscripts, oldscripts): # and length of non intersection along new scripts is not 0, # then dicts are different. for (acl, oldslivers) in oldscripts.iteritems(): - if (len(oldslivers) != len(currentscripts[acl])) or \ - (len(set(oldslivers) - set(currentscripts[acl])) != 0): - _restartvsys = True - logger.log("vsys: Updating %s.acl w/ slices %s" % (acl, currentscripts[acl])) - f = open("%s/%s.acl" % (VSYSBKEND, acl), "w") - for slice in currentscripts[acl]: f.write("%s\n" % slice) - f.close() + try: + if (len(oldslivers) != len(currentscripts[acl])) or \ + (len(set(oldslivers) - set(currentscripts[acl])) != 0): + _restartvsys = True + logger.log("vsys: Updating %s.acl w/ slices %s" % (acl, currentscripts[acl])) + f = open("%s/%s.acl" % (VSYSBKEND, acl), "w") + for slice in currentscripts[acl]: f.write("%s\n" % slice) + f.close() + except KeyError: + logger.log("vsys: #:)# Warning,Not a valid Vsys script,%s"%acl) # Trigger a restart return _restartvsys -- 2.43.0