server/serverctl.py
branchstable
changeset 4888 fc8b4d861f34
parent 4837 54969eec48eb
child 4899 c666d265fb95
child 4937 4e08eba12851
equal deleted inserted replaced
4887:99a95606c2a1 4888:fc8b4d861f34
   328                         return
   328                         return
   329                 if dbcnx.logged_user != source['db-user']:
   329                 if dbcnx.logged_user != source['db-user']:
   330                     helper.create_database(cursor, dbname, source['db-user'],
   330                     helper.create_database(cursor, dbname, source['db-user'],
   331                                            source['db-encoding'])
   331                                            source['db-encoding'])
   332                 else:
   332                 else:
   333                     helper.create_database(cursor, dbname,
   333                     try:
   334                                            encoding=source['db-encoding'])
   334                         helper.create_database(cursor, dbname,
       
   335                                                encoding=source['db-encoding'])
       
   336                     except TypeError:
       
   337                         # logilab.database
       
   338                         helper.create_database(cursor, dbname,
       
   339                                                dbencoding=source['db-encoding'])
   335                 dbcnx.commit()
   340                 dbcnx.commit()
   336                 print '-> database %s created.' % dbname
   341                 print '-> database %s created.' % dbname
   337             except:
   342             except:
   338                 dbcnx.rollback()
   343                 dbcnx.rollback()
   339                 raise
   344                 raise