Changeset 2452 for pykota/trunk/pykota/tool.py

Timestamp:

09/17/05 16:29:43 (19 years ago)

Author:

jerome

Message:

Upgraded database schema.
Added -i | --ingroups command line option to repykota.
Added -C | --comment command line option to edpykota.
Added 'noquota', 'noprint', and 'nochange' as switches for edpykota's
-l | --limitby command line option.
Severity : entirely new features, in need of testers :-)

Files:

• pykota/trunk/pykota/tool.py (modified) (1 diff)

pykota/trunk/pykota/tool.py

@@ -485 +485 @@
         # first we check any group the user is a member of
         for group in self.storage.getUserGroups(user) :
-            grouppquota = self.storage.getGroupPQuota(group, printer)
-            # for the printer and all its parents
-            for gpquota in [ grouppquota ] + grouppquota.ParentPrintersGroupPQuota :
-                if gpquota.Exists :
-                    action = self.checkGroupPQuota(gpquota)
-                    if action == "DENY" :
-                        return action
-                    elif action == "WARN" :    
-                        warned = 1
+            # No need to check anything if the group is in noquota mode
+            if group.LimitBy != "noquota" :
+                grouppquota = self.storage.getGroupPQuota(group, printer)
+                # for the printer and all its parents
+                for gpquota in [ grouppquota ] + grouppquota.ParentPrintersGroupPQuota :
+                    if gpquota.Exists :
+                        action = self.checkGroupPQuota(gpquota)
+                        if action == "DENY" :
+                            return action
+                        elif action == "WARN" :    
+                            warned = 1
                         
         # Then we check the user's account balance