508. Updates COPYING file; adds translations bit

[mediagoblin.git] / mediagoblin / init / __init__.py

diff --git a/mediagoblin/init/__init__.py b/mediagoblin/init/__init__.py
index 64fa9b9248e13e9c48d30a797262798d560906c0..44f604b1c95f5b89fe45fc58fafb8191d74dbe5b 100644 (file)
--- a/mediagoblin/init/__init__.py
+++ b/mediagoblin/init/__init__.py
@@ -61,9 +61,16 @@ def setup_database():
 
     # Tiny hack to warn user if our migration is out of date
     if not migration_manager.database_at_latest_migration():
-        print (
-            "*WARNING:* Your migrations are out of date, "
-            "maybe run ./bin/gmg migrate?")
+        db_migration_num = migration_manager.database_current_migration()
+        latest_migration_num = migration_manager.latest_migration()
+        if db_migration_num < latest_migration_num:
+            print (
+                "*WARNING:* Your migrations are out of date, "
+                "maybe run ./bin/gmg migrate?")
+        elif db_migration_num > latest_migration_num:
+            print (
+                "*WARNING:* Your migrations are out of date... "
+                "in fact they appear to be from the future?!")
 
     setup_globals(
         db_connection = connection,
@@ -105,10 +112,15 @@ def get_staticdirector(app_config):
 
 
 def setup_storage():
-    app_config = mg_globals.app_config
+    global_config = mg_globals.global_config
+
+    key_short = 'publicstore'
+    key_long = "storage:" + key_short
+    public_store = storage_system_from_config(global_config[key_long])
 
-    public_store = storage_system_from_config(app_config, 'publicstore')
-    queue_store = storage_system_from_config(app_config, 'queuestore')
+    key_short = 'queuestore'
+    key_long = "storage:" + key_short
+    queue_store = storage_system_from_config(global_config[key_long])
 
     setup_globals(
         public_store = public_store,