diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2014-01-02 15:01:54 -0600 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2014-01-02 15:01:54 -0600 |
| commit | e0bf6b4bf79fbe5e5c13fce2d91a5a4292b80e16 (patch) | |
| tree | 24206ac14e260404243057351fc6c156e5870bb6 /mediagoblin/app.py | |
| parent | 408aa9cf3b29d778eb7594e4de1720a6bb158024 (diff) | |
| parent | 635dd6cc31d4d9afbe648f76af2f799eebf8f1f1 (diff) | |
| download | mediagoblin-e0bf6b4bf79fbe5e5c13fce2d91a5a4292b80e16.tar.lz mediagoblin-e0bf6b4bf79fbe5e5c13fce2d91a5a4292b80e16.tar.xz mediagoblin-e0bf6b4bf79fbe5e5c13fce2d91a5a4292b80e16.zip | |
Merge remote-tracking branch 'refs/remotes/rodney757/dbupdate'
Conflicts:
mediagoblin/db/util.py
mediagoblin/gmg_commands/dbupdate.py
Diffstat (limited to 'mediagoblin/app.py')
| -rw-r--r-- | mediagoblin/app.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mediagoblin/app.py b/mediagoblin/app.py index e9177eff..e65e6d10 100644 --- a/mediagoblin/app.py +++ b/mediagoblin/app.py @@ -25,6 +25,7 @@ from werkzeug.exceptions import HTTPException from werkzeug.routing import RequestRedirect from mediagoblin import meddleware, __version__ +from mediagoblin.db.util import check_db_up_to_date from mediagoblin.tools import common, session, translate, template from mediagoblin.tools.response import render_http_exception from mediagoblin.tools.theme import register_themes @@ -91,6 +92,9 @@ class MediaGoblinApp(object): # Set up the database self.db = setup_database(app_config['run_migrations']) + # Quit app if need to run dbupdate + check_db_up_to_date() + # Register themes self.theme_registry, self.current_theme = register_themes(app_config) |