aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/init
diff options
context:
space:
mode:
Diffstat (limited to 'mediagoblin/init')
-rw-r--r--mediagoblin/init/__init__.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/mediagoblin/init/__init__.py b/mediagoblin/init/__init__.py
index e0711416..b6421e06 100644
--- a/mediagoblin/init/__init__.py
+++ b/mediagoblin/init/__init__.py
@@ -28,6 +28,8 @@ from mediagoblin.tools.pluginapi import hook_runall
from mediagoblin.tools.workbench import WorkbenchManager
from mediagoblin.storage import storage_system_from_config
+from mediagoblin.tools.transition import DISABLE_GLOBALS
+
class Error(Exception):
pass
@@ -154,4 +156,7 @@ def setup_workbench():
workbench_manager = WorkbenchManager(app_config['workbench_path'])
- setup_globals(workbench_manager=workbench_manager)
+ if not DISABLE_GLOBALS:
+ setup_globals(workbench_manager=workbench_manager)
+
+ return workbench_manager