From: Elrond <elrond+mediagoblin.org@samba-tng.org>
Date: Sun, 7 Aug 2011 15:41:24 +0000 (+0200)
Subject: storage Config: Stop being backward compatible (beginning).
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=f7d73aeb34ed16c7d1aa06d977ffb4c9c7a44051;p=mediagoblin.git

storage Config: Stop being backward compatible (beginning).

Chris Webber says "no backward compatibility for this".
So start removing the backward compat stuff.
---

diff --git a/mediagoblin/init/__init__.py b/mediagoblin/init/__init__.py
index b87bd7a4..32f0194c 100644
--- a/mediagoblin/init/__init__.py
+++ b/mediagoblin/init/__init__.py
@@ -117,19 +117,11 @@ def setup_storage():
 
     key_short = 'publicstore'
     key_long = "storage:" + key_short
-    if global_config.has_key(key_long):
-        print "New style"
-        public_store = storage_system_from_config(global_config[key_long], None)
-    else:
-        print "old style"
-        public_store = storage_system_from_config(app_config, key_short)
+    public_store = storage_system_from_config(global_config[key_long], None)
 
     key_short = 'queuestore'
     key_long = "storage:" + key_short
-    if global_config.has_key(key_long):
-        queue_store = storage_system_from_config(global_config[key_long], None)
-    else:
-        queue_store = storage_system_from_config(app_config, key_short)
+    queue_store = storage_system_from_config(global_config[key_long], None)
 
     setup_globals(
         public_store = public_store,