]> Frank Brehm's Git Trees - pixelpark/ldap-migration.git/commitdiff
Fixing lib/ldap_migration/__init__.py
authorFrank Brehm <frank.brehm@pixelpark.com>
Fri, 15 Jan 2021 15:39:03 +0000 (16:39 +0100)
committerFrank Brehm <frank.brehm@pixelpark.com>
Fri, 15 Jan 2021 15:39:03 +0000 (16:39 +0100)
lib/ldap_migration/__init__.py

index 08926f23161b6082ab2c3aeab38523bfbee77607..201508b6422ae73e4fbbb33b0c6817725d17aef5 100644 (file)
@@ -41,11 +41,11 @@ from fb_tools.common import pp, is_sequence, human2mbytes, to_bool, compare_ldap
 from fb_tools.app import BaseApplication, DirectoryOptionAction
 from fb_tools.config import CfgFileOptionAction
 from fb_tools.errors import FbAppError
-from fb_tools.collections import CIStringSet, CIDict
+from fb_tools.collections import FrozenCIStringSet, CIStringSet, CIDict
 
 from .config import LDAPMigrationConfiguration
 
-__version__ = '0.10.2'
+__version__ = '0.10.3'
 
 LOG = logging.getLogger(__name__)
 CFG_BASENAME = 'ldap-migration.ini'
@@ -196,6 +196,7 @@ class LDAPMigrationApplication(BaseApplication):
         'one': LEVEL,
         'sub': SUBTREE,
     }
+    name_group_classes = FrozenCIStringSet(['groupOfNames', 'groupOfUniqueNames'])
 
     tz = get_localzone()
 
@@ -1991,7 +1992,6 @@ class LDAPMigrationApplication(BaseApplication):
         object_classes = []
         target_entry = {}
         used_classes = CIStringSet()
-        name_group_classes = CIStringSet('groupOfNames', 'groupOfUniqueNames')
 
         src_data = self.get_src_entry_data(src_entry, as_group=True)
         for src_oc_name in src_data['classes']:
@@ -2002,7 +2002,7 @@ class LDAPMigrationApplication(BaseApplication):
         members = src_data['members']
 
         if 'groupOfURLs' in src_data['classes']:
-            if name_group_classes.isdisjoint(src_data['classes']):
+            if self.name_group_classes.isdisjoint(src_data['classes']):
                 members.clear()
                 tgt_oc_name = self.object_classes.real_key('groupOfURLs')
                 used_classes.add(tgt_oc_name)