Mercurial > kallithea

changeset 5945:34ef164e0635 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dbmigrate: fix migration step of missing ldap settings - use defaults (Issue #217)
author Mads Kiilerich <madski@unity3d.com>
date Mon, 30 May 2016 15:32:22 +0200
parents 10a5a5f1bdf6
children ffe4d5060d91
files kallithea/lib/dbmigrate/versions/018_version_2_0_0.py
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/kallithea/lib/dbmigrate/versions/018_version_2_0_0.py	Mon May 02 23:39:08 2016 +0200
+++ b/kallithea/lib/dbmigrate/versions/018_version_2_0_0.py	Mon May 30 15:32:22 2016 +0200
@@ -64,9 +64,11 @@
         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()