X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plugins%2Fvsys.py;h=8d4f34cccc05782189583e6c56e029c02e0e2055;hb=52c1df6319be531a465620d500e36c8d1920923f;hp=6d0ad6cbcec462196f91b3ffdf82121147af0917;hpb=08d6f2b70b86a10b222a5afe80945598296196ad;p=nodemanager.git

diff --git a/plugins/vsys.py b/plugins/vsys.py
index 6d0ad6c..8d4f34c 100644
--- a/plugins/vsys.py
+++ b/plugins/vsys.py
@@ -1,6 +1,3 @@
-# $Id$
-# $URL$
-
 """vsys configurator.  Maintains ACLs and script pipes inside vservers based on slice attributes."""
 
 import logger
@@ -88,13 +85,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