kallithea Changeset - 34ef164e0635

Changeset - 34ef164e0635

Parent rev.

Child rev.

[Not reviewed]

stable

0 1 0

Mads Kiilerich - 10 years ago 2016-05-30 15:32:22
madski@unity3d.com

dbmigrate: fix migration step of missing ldap settings - use defaults (Issue #217)

1 file changed with 4 insertions and 2 deletions:

kallithea/lib/dbmigrate/versions/018_version_2_0_0.py

0 comments (0 inline, 0 general)

kallithea/lib/dbmigrate/versions/018_version_2_0_0.py

➞

Show inline comments

@@ @@ -55,18 +55,20 @@ def fixups(models, _SESSION): @@
     #copy over the LDAP settings
     old_ldap = [('ldap_active', 'false', 'bool'), ('ldap_host', '', 'unicode'),
                 ('ldap_port', '389', 'int'), ('ldap_tls_kind', 'PLAIN', 'unicode'),
                 ('ldap_tls_reqcert', '', 'unicode'), ('ldap_dn_user', '', 'unicode'),
                 ('ldap_dn_pass', '', 'unicode'), ('ldap_base_dn', '', 'unicode'),
                 ('ldap_filter', '', 'unicode'), ('ldap_search_scope', '', 'unicode'),
                 ('ldap_attr_login', '', 'unicode'), ('ldap_attr_firstname', '', 'unicode'),
                 ('ldap_attr_lastname', '', 'unicode'), ('ldap_attr_email', '', 'unicode')]
     for k, v, t in old_ldap:
         old_setting = models.Setting.get_by_name(k)
         name = 'auth_%s' % k
         setting = models.Setting.get_by_name(name)
-        if not setting:
+        if setting is None:
             # if we don't have this option create it
             setting = models.Setting(name, old_setting.app_settings_value, t)
             if old_setting is not None:
                 v = old_setting.app_settings_value
             setting = models.Setting(name, v, t)
         _SESSION().add(setting)
         _SESSION().commit()

0 comments (0 inline, 0 general)