github/pelican
1
0
Fork 1
mirror of https://github.com/getpelican/pelican.git synced 2025-10-15 20:28:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2005 from avaris/1966

Browse source 
Fixes #1966: Track default settings file for changes in autoreload mode
This commit is contained in:
Justin Mayer 2016-09-17 09:25:07 -06:00 • committed by GitHub
commit f0c05686e5
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pelican/__init__.py
View file

@ -277,7 +277,6 @@ def parse_arguments():
'"output" in the current path.') '"output" in the current path.')
parser.add_argument('-s', '--settings', dest='settings', parser.add_argument('-s', '--settings', dest='settings',
default=DEFAULT_CONFIG_NAME,
help='The settings of the application, this is ' help='The settings of the application, this is '
'automatically set to {0} if a file exists with this ' 'automatically set to {0} if a file exists with this '
'name.'.format(DEFAULT_CONFIG_NAME)) 'name.'.format(DEFAULT_CONFIG_NAME))
@ -370,6 +369,7 @@ def get_instance(args):
config_file = args.settings config_file = args.settings
if config_file is None and os.path.isfile(DEFAULT_CONFIG_NAME): if config_file is None and os.path.isfile(DEFAULT_CONFIG_NAME):
config_file = DEFAULT_CONFIG_NAME config_file = DEFAULT_CONFIG_NAME
args.settings = DEFAULT_CONFIG_NAME
settings = read_settings(config_file, override=get_config(args)) settings = read_settings(config_file, override=get_config(args))