Changeset 1220

Timestamp:

Nov 15, 2016, 11:28:19 AM (8 years ago)

Author:

joergs

Message:

cleanup

Location:

dassldapsync

Files:

• dassldapsync.py (modified) (4 diffs)
• dassldapsync.spec (modified) (5 diffs)

dassldapsync/dassldapsync.py

@@ -82 +82 @@
     return results
 
-class LdapSync:
+class LdapSync(object):
     def __init__(self, destserver,destbinddn,destbindpw,srcbasedn,destbasedn,options=Options()):
         self.logger = logging.getLogger()
@@ -96 +96 @@
         self.con = None
         
-        self.attrmap=ldap.cidict.cidict({
-        })
-        self.classmap={ 
-        }
+        self.attrmap=ldap.cidict.cidict({})
+        self.classmap={}
 
         self.junk_attrs = [ "memberof", "modifiersname", "modifytimestamp", "entryuuid", "entrycsn", "contextcsn", "creatorsname", "createtimestamp", "structuralobjectclass", "pwdchangedtime", "pwdfailuretime" ]
@@ -264 +262 @@
                     self.notify_created(dn)
                     result['add']['ok'].append(dn)
-                except (ldap.OBJECT_CLASS_VIOLATION,ldap.NO_SUCH_OBJECT):
+                except (ldap.OBJECT_CLASS_VIOLATION, ldap.NO_SUCH_OBJECT, ldap.CONSTRAINT_VIOLATION):
                     self.logger.warning("failed to add {}".format(dn))
                     result['add']['failed'].append(dn)
@@ -360 +358 @@
 
 
-
-
 if __name__ == "__main__":
     logging.basicConfig(format='%(levelname)s %(module)s.%(funcName)s: %(message)s', level=logging.INFO)

dassldapsync/dassldapsync.spec

@@ -6 +6 @@
 Group: other
 BuildArch: noarch
-URL: http://www.dass-it.de/dassldapsync
+URL: http://trac.dass-it.de/pub/browser/dassldapsync
 
 Source: %{name}_%{version}.tar.gz
@@ -13 +13 @@
 Requires: python >= 2.6
 Requires: python-ldap
+
 %description
 This script compares two different LDAP subtrees and makes
@@ -24 +25 @@
 
 %build
+
 %install
 mkdir -p "%{buildroot}/usr/sbin"
@@ -29 +31 @@
 install -m 644 dassldapsync.conf %{buildroot}/etc/dassldapsync.conf
 install -m 755 dassldapsync.py %{buildroot}/usr/sbin/dassldapsync
+
 %clean
 %{__rm} -rf %{buildroot}
@@ -34 +37 @@
 %files
 %defattr(-,root,root)
-%config /etc/dassldapsync.conf
+%config(noreplace) /etc/dassldapsync.conf
 /usr/sbin/dassldapsync
+
 %changelog
 * Wed Mar 05 2014 Sebastian Lederer slederer@dass-it.de 1.5