kallithea Changeset - 78b3d2d730f2

Changeset - 78b3d2d730f2

Parent rev.

Child rev.

[Not reviewed]

beta

0 2 0

Marcin Kuzminski - 15 years ago 2010-12-11 18:54:25
marcin@python-works.com

fixed import problems

2 files changed with 36 insertions and 7 deletions:

rhodecode/lib/db_manage.py

rhodecode/websetup.py

0 comments (0 inline, 0 general)

rhodecode/lib/db_manage.py

➞

Show inline comments

@@ @@ -34,28 +34,24 @@ from os.path import dirname as dn, join @@
 from rhodecode import __dbversion__
 from rhodecode.model import meta
 from rhodecode.lib.auth import get_crypt_password
 from rhodecode.lib.utils import ask_ok
 from rhodecode.model import init_model
 from rhodecode.model.db import User, Permission, RhodeCodeUi, RhodeCodeSettings, \
     UserToPerm, DbMigrateVersion
 from sqlalchemy.engine import create_engine
 from rhodecode.lib.dbmigrate.migrate.versioning import api
 from rhodecode.lib.dbmigrate.migrate.exceptions import \
     DatabaseNotControlledError
 log = logging.getLogger(__name__)
 class DbManage(object):
     def __init__(self, log_sql, dbconf, root, tests=False):
         self.dbname = dbconf.split('/')[-1]
         self.tests = tests
         self.root = root
         self.dburi = dbconf
         engine = create_engine(self.dburi, echo=log_sql)
         init_model(engine)
         self.sa = meta.Session()
         self.db_exists = False
@@ @@ -102,24 +98,29 @@ class DbManage(object): @@
         except:
             self.sa.rollback()
             raise
         log.info('db version set to: %s', __dbversion__)
     def upgrade(self):
         """Upgrades given database schema to given revision following
         all needed steps,
         :param revision: revision to upgrade to
         """
         from rhodecode.lib.dbmigrate.migrate.versioning import api
         from rhodecode.lib.dbmigrate.migrate.exceptions import \
             DatabaseNotControlledError
         upgrade = ask_ok('You are about to perform database upgrade, make '
                          'sure You backed up your database before. '
                          'Continue ? [y/n]')
         if not upgrade:
             sys.exit('Nothing done')
         repository_path = 'rhodecode/lib/dbmigrate'
         db_uri = self.dburi
         try:
             curr_version = api.db_version(db_uri, repository_path)
             msg = ('Found current database under version'

rhodecode/websetup.py

➞

Show inline comments

 """Setup the rhodecode application"""
 # -*- coding: utf-8 -*-
 """
     rhodecode.websetup
     ~~~~~~~~~~~~~~~~~~
     Weboperations and setup for rhodecode
     :created_on: Dec 11, 2010
     :author: marcink
     :copyright: (C) 2009-2010 Marcin Kuzminski <marcin@python-works.com>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; version 2
 # of the License or (at your opinion) any later version of the license.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 import os
 import logging
 from rhodecode.config.environment import load_environment
 from rhodecode.lib.db_manage import DbManage
 import logging
 import os
 log = logging.getLogger(__name__)
 def setup_app(command, conf, vars):
     """Place any commands to setup rhodecode here"""
     dbconf = conf['sqlalchemy.db1.url']
     dbmanage = DbManage(log_sql=True, dbconf=dbconf, root=conf['here'], tests=False)
     dbmanage.create_tables(override=True)
     dbmanage.set_db_version()
     dbmanage.config_prompt(None)
     dbmanage.create_default_user()
     dbmanage.admin_prompt()

0 comments (0 inline, 0 general)