##// END OF EJS Templates
added default ldap option into migration
marcink -
r1510:90062009 beta
parent child Browse files
Show More
@@ -160,7 +160,9 b' class DbManage(object):'
160 def step_3(self):
160 def step_3(self):
161 print ('Adding additional settings into RhodeCode db')
161 print ('Adding additional settings into RhodeCode db')
162 self.klass.fix_settings()
162 self.klass.fix_settings()
163
163 print ('Adding ldap defaults')
164 self.klass.create_ldap_options(skip_existing=True)
165
164 upgrade_steps = [0] + range(curr_version + 1, __dbversion__ + 1)
166 upgrade_steps = [0] + range(curr_version + 1, __dbversion__ + 1)
165
167
166 #CALL THE PROPER ORDER OF STEPS TO PERFORM FULL UPGRADE
168 #CALL THE PROPER ORDER OF STEPS TO PERFORM FULL UPGRADE
@@ -307,7 +309,7 b' class DbManage(object):'
307 self.sa.rollback()
309 self.sa.rollback()
308 raise
310 raise
309
311
310 def create_ldap_options(self):
312 def create_ldap_options(self,skip_existing=False):
311 """Creates ldap settings"""
313 """Creates ldap settings"""
312
314
313 try:
315 try:
@@ -319,6 +321,9 b' class DbManage(object):'
319 ('ldap_attr_login', ''), ('ldap_attr_firstname', ''),
321 ('ldap_attr_login', ''), ('ldap_attr_firstname', ''),
320 ('ldap_attr_lastname', ''), ('ldap_attr_email', '')]:
322 ('ldap_attr_lastname', ''), ('ldap_attr_email', '')]:
321
323
324 if skip_existing and RhodeCodeSettings.get_by_name(k) != None:
325 log.debug('Skipping option %s' % k)
326 continue
322 setting = RhodeCodeSettings(k, v)
327 setting = RhodeCodeSettings(k, v)
323 self.sa.add(setting)
328 self.sa.add(setting)
324 self.sa.commit()
329 self.sa.commit()
General Comments 0
You need to be logged in to leave comments. Login now