Changeset 2751 for pykota

Timestamp:

02/23/06 14:44:00 (19 years ago)

Author:

jerome

Message:

Logs something instead of failing when an entry to delete is missing : normal case if you delete printers and users at the same time in two different xterms.

Files:

• pykota/trunk/pykota/storages/ldapstorage.py (modified) (2 diffs)

pykota/trunk/pykota/storages/ldapstorage.py

@@ -192 +192 @@
                 self.database.add_s(dn, entry)
             except ldap.ALREADY_EXISTS, msg :        
-                raise PyKotaStorageError
+                raise PyKotaStorageError, "Entry %s already exists : %s" % (dn, str(msg))
             except ldap.LDAPError, msg :
                 message = (_("Problem adding LDAP entry (%s, %s)") % (dn, str(fields))) + " : %s" % str(msg)
@@ -213 +213 @@
                 self.tool.logdebug("QUERY : Delete(%s)" % dn)
                 self.database.delete_s(dn)
+            except ldap.NO_SUCH_OBJECT :    
+                self.tool.printInfo("Entry %s was already missing before we deleted it. This **MAY** be normal." % dn, "info")
             except ldap.LDAPError, msg :
                 message = (_("Problem deleting LDAP entry (%s)") % dn) + " : %s" % str(msg)