null acl for missing lockers, rather than error

svn path=/trunk/packages/invirt-web/; revision=1986

diff --git a/code/cache_acls.py b/code/cache_acls.py
index 8cd6977..fe69815 100644 (file)
--- a/code/cache_acls.py
+++ b/code/cache_acls.py
@@ -10,7 +10,10 @@ def expandLocker(name):
         groups = getafsgroups.getLockerAcl(name)
     except getafsgroups.AfsProcessError, e:
         if e.message.startswith("fs: You don't have the required access rights on"):
         groups = getafsgroups.getLockerAcl(name)
     except getafsgroups.AfsProcessError, e:
         if e.message.startswith("fs: You don't have the required access rights on"):

-            groups = []
+            return []
+        elif e.message.endswith("doesn't exist\n"):
+            # presumably deactivated
+            return []

         else:
             raise
     cell = getafsgroups.getCell(name)
         else:
             raise
     cell = getafsgroups.getCell(name)