Changeset 815

Timestamp:

02/27/03 10:04:46 (22 years ago)

Author:

jalet

Message:

user and group names can be passed as wildcards if the --add option
is not set. The default is to act on all users or groups.

Files:

• pykota/trunk/bin/edpykota (modified) (5 diffs)

pykota/trunk/bin/edpykota

@@ -17 +17 @@
 #
 # $Log$
+# Revision 1.21  2003/02/27 09:04:46  jalet
+# user and group names can be passed as wildcards if the --add option
+# is not set. The default is to act on all users or groups.
+#
 # Revision 1.20  2003/02/10 12:07:30  jalet
 # Now repykota should output the recorded total page number for each printer too.
@@ -123 +127 @@
   -H | --hardlimit hl  Sets the quota hard limit to hl pages.
   
+  user1 through userN and group1 through groupN can use wildcards
+  if the --add option is not set.
+  
 examples :                              
 
@@ -149 +156 @@
   to 550 pages for groups financial and support on all printers.
   
-  $ edpykota --reset jerome 
-  
-  This will reset jerome's page counter to zero on all printers. 
-  His life time page counter on each printer will be kept unchanged.
+  $ edpykota --reset jerome "jo*"
+  
+  This will reset jerome's page counter to zero on all printers, as
+  well as every user whose name begins with 'jo'.
+  Their life time page counter on each printer will be kept unchanged.
 
 This program is free software; you can redistribute it and/or modify
@@ -200 +208 @@
             self.logger.log_message(_("Hard limit %i is less than soft limit %i, values will be exchanged.") % (hardlimit, softlimit), "warn")
             (softlimit, hardlimit) = (hardlimit, softlimit)
+        if not names :    
+            if options["add"] :
+                raise PyKotaToolError, _("You have to pass user names on the command line")
+            else :    
+                names = [ "*" ] # all users
         for (printer, printerpagecounter) in printernames :
             if options["prototype"] :
@@ -219 +232 @@
             if (not options["reset"]) and ((hardlimit is None) or (softlimit is None)) :        
                 raise PyKotaToolError, _("Both hard and soft limits must be set ! Aborting.")
-            for name in names :
+            if options["users"] :    
+                allnames = self.storage.getPrinterUsers(printer)
+            else :    
+                allnames = self.storage.getPrinterGroups(printer)
+            for name in [n for n in allnames if self.matchString(n, names)]:
                 if options["users"] :
                     quota = self.storage.getUserPQuota(name, printer)