Move CodeError and InvalidInput into invirt.common

[invirt/packages/invirt-web.git] / code / getafsgroups.py

diff --git a/code/getafsgroups.py b/code/getafsgroups.py
index c775a01..13f8cf7 100644 (file)
--- a/code/getafsgroups.py
+++ b/code/getafsgroups.py
@@ -48,15 +48,10 @@ def getCell(locker):
     return p.stdout.read().split()[-1][1:-1]
 
 def getLockerAcl(locker):
     return p.stdout.read().split()[-1][1:-1]
 
 def getLockerAcl(locker):

-    try:
-        p = subprocess.Popen(["fs", "listacl", getLockerPath(locker)], 
-                             stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-        if p.wait():
-            raise AfsProcessError(p.stderr.read())
-    except AfsProcessError, e:
-        if e.message.startswith("fs: You don't have the required access rights on"):
-            return []
-        raise
+    p = subprocess.Popen(["fs", "listacl", getLockerPath(locker)], 
+                         stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    if p.wait():
+        raise AfsProcessError(p.stderr.read())

     lines = p.stdout.readlines()
     values = []
     for line in lines[1:]:
     lines = p.stdout.readlines()
     values = []
     for line in lines[1:]: