symbolic description can be a list

src/action/chmodsym.py

@@ -35,7 +35,7 @@ def chmod(path, actperms, description):
     if not description:
         return False
 
-    if isint(description):
+    if isinstance(description, basestring):
         if handle_octal(path, actperms, description):
             return True
         else:
@@ -67,21 +67,22 @@ def handle_symbolic(path, actperms, description):
     if chmod.regex is None:
         chmod.regex = re.compile(r"^(?P<who>[ugo]*|[a]?)(?P<op>[+\-=])"
                                   "(?P<value>[ugo]|[rwx]*)$")
-    mo = chmod.regex.match(description)
-    who, op, value = mo.group("who"), mo.group("op"), mo.group("value")
-    if not who:
-        who = "a"
     mode = actperms[2]
     modeold = mode
-    for person in who:
-        if value in ("o", "g", "u"):
-            mask = (ors((stat_bit(person, z) for z in "rwx"
-                    if (mode & stat_bit(value, z)))))
-        else:
-            mask = ors((stat_bit(person, z) for z in value))
-        if op == "=":
-            mode &= ~ ors((stat_bit(person, z) for z in  "rwx"))
-        mode = (mode & ~mask) if (op == "-") else (mode | mask)
+    for desc in description:
+        mo = chmod.regex.match(desc)
+        who, op, value = mo.group("who"), mo.group("op"), mo.group("value")
+        if not who:
+            who = "a"
+        for person in who:
+            if value in ("o", "g", "u"):
+                mask = (ors((stat_bit(person, z) for z in "rwx"
+                        if (mode & stat_bit(value, z)))))
+            else:
+                mask = ors((stat_bit(person, z) for z in value))
+            if op == "=":
+                mode &= ~ ors((stat_bit(person, z) for z in  "rwx"))
+            mode = (mode & ~mask) if (op == "-") else (mode | mask)
 
     if mode == modeold:
         return False
@@ -112,15 +113,6 @@ def ors(sequence, initial = 0):
     return functools.reduce(operator.__or__, sequence, initial)
 
 
-def isint(description):
-    try:
-        int(description)
-    except ValueError:
-        return False
-    else:
-        return True
-
-
 # Test code
 
 def test_code():

src/configfile/check_chmod.py

@@ -8,8 +8,8 @@
 def check_chmod(parser, section, what, debug):
     if parser.has_option(section, what):
         tempchmod = parser.get(section, what)
-        if verify_chmod(tempchmod):
-            chmod = tempchmod
+        chmod = verify_chmod(tempchmod)
+        if chmod:
             if debug:
                 print >> sys.stderr, ("[debug] '%s' in section '%s' "
                                       "is valid" % (what, section))
@@ -36,11 +36,19 @@ def verify_chmod(description):
             if len(description) < 3 or len(description) > 4:
                 return False
             else:
-                return True
+                return description
     else:
-        p = re.compile(r"^([ugo]*|[a]?)([+\-=])([ugo]|[rwx]*)$")
-        if p.match(description):
-            return True
+        valid = True
+        symdesc = []
+        for sym in description.split(','):
+            sym = sym.strip()
+            p = re.compile(r"^([ugo]*|[a]?)([+\-=])([ugo]|[rwx]*)$")
+            if p.match(sym):
+                symdesc.append(sym)
+            else:
+                valid = False
+        if valid:
+            return symdesc
         else:
             return False