# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 2016-05-30 15:32:22
# Node ID 34ef164e06356e82c8405fd5cfda15698c163023
# Parent  10a5a5f1bdf6f18a1d29a31156c9d7a6993368ec

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

diff --git a/kallithea/lib/dbmigrate/versions/018_version_2_0_0.py b/kallithea/lib/dbmigrate/versions/018_version_2_0_0.py
--- a/kallithea/lib/dbmigrate/versions/018_version_2_0_0.py
+++ b/kallithea/lib/dbmigrate/versions/018_version_2_0_0.py
@@ -64,9 +64,11 @@ def fixups(models, _SESSION):
         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()