From a8acb5a387fd8b7365e6762d1f0573262ad5f596 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Sun, 20 May 2012 15:17:49 -0500 Subject: [PATCH] from_celery.setup_self() didn't pay attention to default_conf_file kwarg, fixed. --- mediagoblin/init/celery/from_celery.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/mediagoblin/init/celery/from_celery.py b/mediagoblin/init/celery/from_celery.py index c20f02c7..b8297255 100644 --- a/mediagoblin/init/celery/from_celery.py +++ b/mediagoblin/init/celery/from_celery.py @@ -35,10 +35,11 @@ def setup_self(check_environ_for_conf=True, module_name=OUR_MODULENAME, Note that if celery_setup_elsewhere is set in your config file, this simply won't work. """ - if os.path.exists(os.path.abspath('mediagoblin_local.ini')): - default_conf_file = 'mediagoblin_local.ini' - else: - default_conf_file = 'mediagoblin.ini' + if not default_conf_file: + if os.path.exists(os.path.abspath('mediagoblin_local.ini')): + default_conf_file = 'mediagoblin_local.ini' + else: + default_conf_file = 'mediagoblin.ini' if check_environ_for_conf: mgoblin_conf_file = os.path.abspath( -- 2.25.1