diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2012-04-01 15:36:11 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2012-04-01 15:36:11 -0500 |
| commit | e089b66bde44ec90950a0acc9d471245295ffa4e (patch) | |
| tree | 0c73c429ccbb312c5be22a17f4ee954f9461e75f /mediagoblin/gmg_commands | |
| parent | 1e3a0e0ca0c58ae740424fa6cf239f2dba5dc592 (diff) | |
| parent | bc27a100fc05cea72c47d8ae446454d347d0a0ff (diff) | |
| download | mediagoblin-e089b66bde44ec90950a0acc9d471245295ffa4e.tar.lz mediagoblin-e089b66bde44ec90950a0acc9d471245295ffa4e.tar.xz mediagoblin-e089b66bde44ec90950a0acc9d471245295ffa4e.zip | |
Merge remote-tracking branch 'refs/remotes/elrond/sql/final'
Conflicts:
mediagoblin/tests/test_submission.py
Also, WHOO SQL SWITCHOVER PARTY!
ASCII DANCE PARTY
/_o_/ \ / \o_ o
( _|_ ) //)
/\ / o \ /| /|
*BMCH BMCH BMCH BMCH*
%
/_o_/ HHHYAAaaaaa
/_
/ /
%
AAAAAHAHAHAHAHHHAAHA
,, .------
o_o ;; /\\ \ $ __
'\/ || // \\ # /_/
\// // //\\ \
) \\ \ %
\\ \\_____\
| ) //-------
/_/_ // //
SWITCH YOUR DATABASE
FLIP A FUKKEN BOOLEAN
%
__________
.-' '-.
.' '.
.' _--_ _--_ '.
/ / (_). / (_). \
. | | | | .
| ._____, ._____, |
| ____________________ |
| | | |
' \ / '
\ '. .----./ /
\ '._ / / /
'. '--------' .'
'._ _.'
'----------'
Diffstat (limited to 'mediagoblin/gmg_commands')
| -rw-r--r-- | mediagoblin/gmg_commands/dbupdate.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/mediagoblin/gmg_commands/dbupdate.py b/mediagoblin/gmg_commands/dbupdate.py index 27698170..5415b997 100644 --- a/mediagoblin/gmg_commands/dbupdate.py +++ b/mediagoblin/gmg_commands/dbupdate.py @@ -65,14 +65,13 @@ def gather_database_data(media_types): return managed_dbdata -def dbupdate(args): +def run_dbupdate(app_config): """ Initialize or migrate the database as specified by the config file. Will also initialize or migrate all extensions (media types, and in the future, plugins) """ - globa_config, app_config = setup_global_and_app_config(args.conf_file) # Gather information from all media managers / projects dbdatas = gather_database_data(app_config['media_types']) @@ -87,3 +86,8 @@ def dbupdate(args): for dbdata in dbdatas: migration_manager = dbdata.make_migration_manager(Session()) migration_manager.init_or_migrate() + + +def dbupdate(args): + global_config, app_config = setup_global_and_app_config(args.conf_file) + run_dbupdate(app_config) |