Changeset 1318

Timestamp:

01/28/04 11:05:22 (20 years ago)

Author:

jalet

Message:

New user/group deletion code

Location:

pykota/trunk

Files:

• bin/edpykota (modified) (4 diffs)
• NEWS (modified) (1 diff)
• pykota/version.py (modified) (1 diff)

pykota/trunk/bin/edpykota

@@ -24 +24 @@
 #
 # $Log$
+# Revision 1.68  2004/01/28 10:05:22  jalet
+# New user/group deletion code
+#
 # Revision 1.67  2004/01/15 11:19:07  jalet
 # Typos in messages wrt gettext.
@@ -497 +500 @@
             printersgroups = self.storage.getMatchingPrinters(options["pgroups"])
             
+        todelete = {}    
         changed = {} # tracks changes made at the user/group level
         for printer in printers :
@@ -577 +581 @@
                 else :    
                     if options["delete"] :
-                        entry.delete()
+                        todelete[entry.Name] = entry # will be done for each printer, we don't care.
                     else :
                         if options["noquota"] or options["prototype"] or ((softlimit is not None) and (hardlimit is not None)) :
@@ -616 +620 @@
                         # The check will be done at print time anyway.
                         # getattr(self, "warn%sPQuota" % suffix)(entrypquota)    
+                        
+        # Now delete what has to be deleted                
+        for (name, entry) in todelete.items() :                
+            entry.delete()
                      
 if __name__ == "__main__" : 

pykota/trunk/NEWS

@@ -22 +22 @@
 PyKota NEWS :
 
+    - 1.17alpha1 :
+    
+        - User/Group deletion code in edpykota rewritten.
+        
     - 1.16 :
     

pykota/trunk/pykota/version.py

@@ -22 +22 @@
 #
 
-__version__ = "1.16_unofficial"
+__version__ = "1.17alpha1_unofficial"
 
 __doc__ = """PyKota : a complete Printing Quota Solution for CUPS and LPRng."""