From d7764c68cddf71645439f295c31532e528231051 Mon Sep 17 00:00:00 2001 From: Evan Broder Date: Mon, 20 Oct 2008 13:55:53 -0400 Subject: [PATCH] Revert r1154 and instead apply the patch in cache_acls so that an error is still thrown when the ACL is looked up as part of the website code svn path=/trunk/packages/sipb-xen-www/; revision=1155 --- code/cache_acls.py | 7 ++++++- code/getafsgroups.py | 13 ++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/code/cache_acls.py b/code/cache_acls.py index fa9b9f9..1a23587 100644 --- a/code/cache_acls.py +++ b/code/cache_acls.py @@ -6,7 +6,12 @@ import getafsgroups import subprocess def expandLocker(name): - groups = getafsgroups.getLockerAcl(name) + try: + groups = getafsgroups.getLockerAcl(name) + except getafsgroups.AfsProcessError, e: + if e.message.startswith("fs: You don't have the required access rights on"): + groups = [] + raise cell = getafsgroups.getCell(name) ans = set() for group in groups: diff --git a/code/getafsgroups.py b/code/getafsgroups.py index c775a01..13f8cf7 100644 --- 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): - 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:]: -- 1.7.9.5