aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/gmg_commands/migrate.py
diff options
context:
space:
mode:
authorChristopher Allan Webber <cwebber@dustycloud.org>2011-11-18 09:34:09 -0600
committerChristopher Allan Webber <cwebber@dustycloud.org>2011-11-18 09:34:09 -0600
commit817066506d846d06d0489dfb42b8200b86f61153 (patch)
tree36578ed7e5b2b205c919fcfb8929c8fc33a79c3f /mediagoblin/gmg_commands/migrate.py
parent76c6c806caec7af20a3fe11c04bb783baacc3934 (diff)
parent3618a9ac5112c657fd095a0f9cbd346921a4e800 (diff)
downloadmediagoblin-817066506d846d06d0489dfb42b8200b86f61153.tar.lz
mediagoblin-817066506d846d06d0489dfb42b8200b86f61153.tar.xz
mediagoblin-817066506d846d06d0489dfb42b8200b86f61153.zip
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
Conflicts: mediagoblin/templates/mediagoblin/user_pages/user.html
Diffstat (limited to 'mediagoblin/gmg_commands/migrate.py')
-rw-r--r--mediagoblin/gmg_commands/migrate.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/mediagoblin/gmg_commands/migrate.py b/mediagoblin/gmg_commands/migrate.py
index fad9b363..beea109d 100644
--- a/mediagoblin/gmg_commands/migrate.py
+++ b/mediagoblin/gmg_commands/migrate.py
@@ -53,13 +53,13 @@ def migrate(args):
for collection, index_name in removed_indexes:
print "Removed index '%s' in collection '%s'" % (
index_name, collection)
-
+
# Migrate
print "\n== Applying migrations... =="
migration_manager.migrate_new(
pre_callback=_print_started_migration,
post_callback=_print_finished_migration)
-
+
# Add new indexes
print "\n== Adding new indexes... =="
new_indexes = db_util.add_new_indexes(db)