aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/init
diff options
context:
space:
mode:
authorChristopher Allan Webber <cwebber@dustycloud.org>2013-05-21 16:07:18 -0500
committerChristopher Allan Webber <cwebber@dustycloud.org>2013-05-23 13:33:07 -0500
commit5ccb16ca20ea55f0dfb16c3e87e65a63b8455e79 (patch)
tree7403838a597ca993934f4a0885b8bfdfcfa8bfdd /mediagoblin/init
parentd6d2c771bdc111cd26186b1bc42b44f2b3197e05 (diff)
downloadmediagoblin-5ccb16ca20ea55f0dfb16c3e87e65a63b8455e79.tar.lz
mediagoblin-5ccb16ca20ea55f0dfb16c3e87e65a63b8455e79.tar.xz
mediagoblin-5ccb16ca20ea55f0dfb16c3e87e65a63b8455e79.zip
Work towards getting plugin static linking/serving to work
- add link_plugin_assets. For now, incorrectly running from ./bin/gmg theme assetlink... uh, will fix ;) - Update paste and config_spec.ini configs to handle the locations and serving of the plugins' static resources This commit sponsored by Marko Dimjašević. Thank you!
Diffstat (limited to 'mediagoblin/init')
-rw-r--r--mediagoblin/init/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/mediagoblin/init/__init__.py b/mediagoblin/init/__init__.py
index 1eb9f1ba..6eed8ff8 100644
--- a/mediagoblin/init/__init__.py
+++ b/mediagoblin/init/__init__.py
@@ -24,7 +24,7 @@ from mediagoblin import mg_globals
from mediagoblin.mg_globals import setup_globals
from mediagoblin.db.open import setup_connection_and_db_from_config, \
check_db_migrations_current, load_models
-from mediagoblin.pluginapi import hook_runall
+from mediagoblin.tools.pluginapi import hook_runall
from mediagoblin.tools.workbench import WorkbenchManager
from mediagoblin.storage import storage_system_from_config