Changeset 1155


Ignore:
Timestamp:
Oct 20, 2008, 1:55:53 PM (16 years ago)
Author:
broder
Message:

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

Location:
trunk/packages/sipb-xen-www/code
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/packages/sipb-xen-www/code/cache_acls.py

    r1095 r1155  
    77
    88def expandLocker(name):
    9     groups = getafsgroups.getLockerAcl(name)
     9    try:
     10        groups = getafsgroups.getLockerAcl(name)
     11    except getafsgroups.AfsProcessError, e:
     12        if e.message.startswith("fs: You don't have the required access rights on"):
     13            groups = []
     14        raise
    1015    cell = getafsgroups.getCell(name)
    1116    ans = set()

  • trunk/packages/sipb-xen-www/code/getafsgroups.py

    r1154 r1155  
    4949
    5050def getLockerAcl(locker):
    51     try:
    52         p = subprocess.Popen(["fs", "listacl", getLockerPath(locker)],
    53                              stdout=subprocess.PIPE, stderr=subprocess.PIPE)
    54         if p.wait():
    55             raise AfsProcessError(p.stderr.read())
    56     except AfsProcessError, e:
    57         if e.message.startswith("fs: You don't have the required access rights on"):
    58             return []
    59         raise
     51    p = subprocess.Popen(["fs", "listacl", getLockerPath(locker)],
     52                         stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     53    if p.wait():
     54        raise AfsProcessError(p.stderr.read())
    6055    lines = p.stdout.readlines()
    6156    values = []
Note: See TracChangeset for help on using the changeset viewer.