From f2b602c7ec651274c7d6bfd79d97b8a9fbeb2113 Mon Sep 17 00:00:00 2001
From: theolind <theodor.lindquist@gmail.com>
Date: Sat, 28 Feb 2015 17:42:23 +0100
Subject: [PATCH] Added logic to main that prefers .yaml-config over .conf
---
homeassistant/__main__.py | 12 ++++++++----
homeassistant/bootstrap.py | 1 +
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/homeassistant/__main__.py b/homeassistant/__main__.py
index 05de14dbefc..13703dee416 100644
--- a/homeassistant/__main__.py
+++ b/homeassistant/__main__.py
@@ -72,15 +72,19 @@ def ensure_config_path(config_dir):
'directory {} ').format(config_dir))
sys.exit()
- config_path = os.path.join(config_dir, 'home-assistant.conf')
+ # Try to use yaml configuration first
+ config_path = os.path.join(config_dir, 'configuration.yaml')
+ if not os.path.isfile(config_path):
+ config_path = os.path.join(config_dir, 'home-assistant.conf')
# Ensure a config file exists to make first time usage easier
if not os.path.isfile(config_path):
+ config_path = os.path.join(config_dir, 'configuration.yaml')
try:
with open(config_path, 'w') as conf:
- conf.write("[frontend]\n\n")
- conf.write("[discovery]\n\n")
- conf.write("[history]\n\n")
+ conf.write("frontend:\n\n")
+ conf.write("discovery:\n\n")
+ conf.write("history:\n\n")
except IOError:
print(('Fatal Error: No configuration file found and unable '
'to write a default one to {}').format(config_path))
diff --git a/homeassistant/bootstrap.py b/homeassistant/bootstrap.py
index 3c1d722768b..b7de8a6cd33 100644
--- a/homeassistant/bootstrap.py
+++ b/homeassistant/bootstrap.py
@@ -112,6 +112,7 @@ def from_config_file(config_path, hass=None):
# Set config dir to directory holding config file
hass.config_dir = os.path.abspath(os.path.dirname(config_path))
+ config_dict = {}
# check config file type
if(os.path.splitext(config_path)[1] == '.yaml'):
# Read yaml