diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-11-13 20:23:26 -0600 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-11-13 20:23:26 -0600 |
| commit | ee91c2b88d1a42b9d15d34d2c081cd8394649041 (patch) | |
| tree | 01a75b958b2814763a0b219145bbe284d1d04931 /mediagoblin/init/celery/from_celery.py | |
| parent | 4671fda345394dad9ca4278b1cf7b2cdf7d2b4ee (diff) | |
| parent | 285ffeddf3542201b83072d3be544c85e9c487c2 (diff) | |
| download | mediagoblin-ee91c2b88d1a42b9d15d34d2c081cd8394649041.tar.lz mediagoblin-ee91c2b88d1a42b9d15d34d2c081cd8394649041.tar.xz mediagoblin-ee91c2b88d1a42b9d15d34d2c081cd8394649041.zip | |
Merge remote-tracking branch 'remotes/nyergler/pep8-ification'
Conflicts:
mediagoblin/db/migrations.py
mediagoblin/db/models.py
mediagoblin/user_pages/views.py
mediagoblin/util.py
Diffstat (limited to 'mediagoblin/init/celery/from_celery.py')
| -rw-r--r-- | mediagoblin/init/celery/from_celery.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mediagoblin/init/celery/from_celery.py b/mediagoblin/init/celery/from_celery.py index 3e5adb98..05669b67 100644 --- a/mediagoblin/init/celery/from_celery.py +++ b/mediagoblin/init/celery/from_celery.py @@ -44,7 +44,7 @@ def setup_self(check_environ_for_conf=True, module_name=OUR_MODULENAME, if not os.path.exists(mgoblin_conf_file): raise IOError( "MEDIAGOBLIN_CONFIG not set or file does not exist") - + # By setting the environment variable here we should ensure that # this is the module that gets set up. os.environ['CELERY_CONFIG_MODULE'] = module_name |