Changeset 2323

Timestamp:

06/24/05 16:17:54 (19 years ago)

Author:

jerome

Message:

Now logs a warning when user/group doesn't exist when running edpykota.
NB : the message is only printed once all users/groups have been processed.
Severity : if you don't need this, you don't need to upgrade.

Location:

pykota/trunk

Files:

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

pykota/trunk/bin/edpykota

@@ -353 +353 @@
                 overcharge = getattr(protoentry, "OverCharge", None)
             
+        missingusers = {}
+        missinggroups = {}    
         todelete = {}    
         changed = {} # tracks changes made at the user/group level
@@ -400 +402 @@
                 allentries = getattr(self.storage, "getPrinter%ssAndQuotas" % suffix)(printer, names)
                 
+            # TODO : do this only once !!!    
+            allnames = [entry.Name for (entry, dummy) in allentries]
+            for name in names :    
+                if not self.matchString(name, allnames) :
+                    if options["groups"] :
+                        missinggroups[name] = 1
+                    else :    
+                        missingusers[name] = 1
+                
             for (entry, entrypquota) in allentries :
                 if not changed.has_key(entry.Name) :
@@ -435 +446 @@
                             else :    
                                 self.printInfo(_("Invalid user name %s") % entry.Name)
+                    else :
+                        if options["groups"] :
+                            missinggroups[entry.Name] = 1
+                        else :    
+                            missingusers[entry.Name] = 1
                 elif options["delete"] :                
                     todelete[entry.Name] = entry
@@ -490 +506 @@
                                     self.printInfo(_("Group %s not found in the PyKota Storage.") % groupname)
                         
+        # Now outputs the list of nonexistent users and groups                
+        for name in missingusers.keys() :
+            self.printInfo(_("Nonnexistent user %s") % name, level="warn")
+        for name in missinggroups.keys() :
+            self.printInfo(_("Nonnexistent group %s") % name, level="warn")
+        
         # Now delete what has to be deleted                
         for (name, entry) in todelete.items() :                

pykota/trunk/NEWS

@@ -22 +22 @@
 PyKota NEWS :
        
+    - 1.23alpha14 : 
+    
+        - Logs a warning when the user/group doesn't exist when running
+          edpykota.
+          
     - 1.23alpha13 :
     

pykota/trunk/pykota/version.py

@@ -22 +22 @@
 #
 
-__version__ = "1.23alpha13_unofficial"
+__version__ = "1.23alpha14_unofficial"
 
 __doc__ = "PyKota : a complete Printing Quota Solution for CUPS and LPRng."

pykota/trunk/TODO

@@ -22 +22 @@
 TODO, in no particular order :
         
+        - Adds configurability to what happens when the user/group doesn't exist
+          when running edpykota.
+          
         - Add the listing of the member printers in pkprinters if the printer
           is a printer group.