kallithea Changeset - 90062009bb1e

Changeset - 90062009bb1e

Parent rev.

Child rev.

[Not reviewed]

beta

0 1 0

Marcin Kuzminski - 14 years ago 2011-10-04 22:43:26
marcin@python-works.com

added default ldap option into migration

1 file changed with 7 insertions and 2 deletions:

rhodecode/lib/db_manage.py

0 comments (0 inline, 0 general)

rhodecode/lib/db_manage.py

➞

Show inline comments

@@ @@ -160,7 +160,9 @@ class DbManage(object): @@
             def step_3(self):
                 print ('Adding additional settings into RhodeCode db')
                 self.klass.fix_settings()
                 print ('Adding ldap defaults')
                 self.klass.create_ldap_options(skip_existing=True)
         upgrade_steps = [0] + range(curr_version + 1, __dbversion__ + 1)
         #CALL THE PROPER ORDER OF STEPS TO PERFORM FULL UPGRADE
@@ @@ -307,7 +309,7 @@ class DbManage(object): @@
             self.sa.rollback()
             raise
     def create_ldap_options(self):
+    def create_ldap_options(self,skip_existing=False):
         """Creates ldap settings"""
         try:
@@ @@ -319,6 +321,9 @@ class DbManage(object): @@
                         ('ldap_attr_login', ''), ('ldap_attr_firstname', ''),
                         ('ldap_attr_lastname', ''), ('ldap_attr_email', '')]:
                 if skip_existing and RhodeCodeSettings.get_by_name(k) != None:
                     log.debug('Skipping option %s' % k)
                     continue
                 setting = RhodeCodeSettings(k, v)
                 self.sa.add(setting)
             self.sa.commit()

0 comments (0 inline, 0 general)