[fix] this test should happen before we thread settings as a dict

This commit is contained in:
Laurent Peuch 2016-05-04 10:02:22 +02:00
parent 9102a73b1e
commit 8a2b63ecc4

View File

@ -198,12 +198,12 @@ def main():
error(os.path.exists(os.path.join(os.getcwd(), "settings.yaml")), "I can't find a " error(os.path.exists(os.path.join(os.getcwd(), "settings.yaml")), "I can't find a "
"settings.yaml in the current working directory") "settings.yaml in the current working directory")
error(isinstance(settings, dict), "Your settings.yaml should be a dict")
for key, value in DEFAULTS.items(): for key, value in DEFAULTS.items():
if key not in settings: if key not in settings:
settings[key] = value settings[key] = value
error(isinstance(settings, dict), "Your settings.yaml should be a dict")
error(settings.get("title"), "You need to specify a title in your main settings.yaml") error(settings.get("title"), "You need to specify a title in your main settings.yaml")
if (settings["rss"] or settings["share"]) and not settings.get("url"): if (settings["rss"] or settings["share"]) and not settings.get("url"):