jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-23 05:07:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor tweaks

Browse Source 
Moved another import to the top of main.
Forced an exit code of 1 when there is an error initializing.
This commit is contained in:
Ryan Kraus 2015-08-29 23:31:33 -04:00
parent 4e01e7ca9b
commit bea81ddd92
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
homeassistant/__main__.py
View File

@ -8,6 +8,7 @@ import importlib
from homeassistant import bootstrap from homeassistant import bootstrap
import homeassistant.config as config_util import homeassistant.config as config_util
from homeassistant.const import EVENT_HOMEASSISTANT_START
def validate_python(): def validate_python():
@ -16,7 +17,7 @@ def validate_python():
if major < 3 or (major == 3 and minor < 4): if major < 3 or (major == 3 and minor < 4):
print("Home Assistant requires atleast Python 3.4") print("Home Assistant requires atleast Python 3.4")
sys.exit() sys.exit(1)
def ensure_pip(): def ensure_pip():
@ -26,7 +27,7 @@ def ensure_pip():
print("Home Assistant requires 'pip' to be installed.") print("Home Assistant requires 'pip' to be installed.")
print("Please install pip: " print("Please install pip: "
"https://pip.pypa.io/en/latest/installing.html") "https://pip.pypa.io/en/latest/installing.html")
sys.exit() sys.exit(1)
def ensure_config_path(config_dir): def ensure_config_path(config_dir):
@ -37,17 +38,17 @@ def ensure_config_path(config_dir):
# Test if configuration directory exists # Test if configuration directory exists
if not os.path.isdir(config_dir): if not os.path.isdir(config_dir):
if config_dir == config_util.get_default_config_dir(): if config_dir != config_util.get_default_config_dir():
try:
os.mkdir(config_dir)
except OSError:
print(('Fatal Error: Unable to create default configuration '
'directory {} ').format(config_dir))
sys.exit()
else:
print(('Fatal Error: Specified configuration directory does ' print(('Fatal Error: Specified configuration directory does '
'not exist {} ').format(config_dir)) 'not exist {} ').format(config_dir))
sys.exit() sys.exit(1)
try:
os.mkdir(config_dir)
except OSError:
print(('Fatal Error: Unable to create default configuration '
'directory {} ').format(config_dir))
sys.exit(1)
# Test if library directory exists # Test if library directory exists
if not os.path.isdir(lib_dir): if not os.path.isdir(lib_dir):
@ -56,13 +57,13 @@ def ensure_config_path(config_dir):
except OSError: except OSError:
print(('Fatal Error: Unable to create library ' print(('Fatal Error: Unable to create library '
'directory {} ').format(lib_dir)) 'directory {} ').format(lib_dir))
sys.exit() sys.exit(1)
config_path = config_util.ensure_config_exists(config_dir) config_path = config_util.ensure_config_exists(config_dir)
if config_path is None: if config_path is None:
print('Error getting configuration path') print('Error getting configuration path')
sys.exit() sys.exit(1)
return config_path return config_path
@ -110,7 +111,7 @@ def main():
if hass.config.api is not None: if hass.config.api is not None:
import webbrowser import webbrowser
webbrowser.open(hass.config.api.base_url) webbrowser.open(hass.config.api.base_url)
from homeassistant.const import EVENT_HOMEASSISTANT_START
hass.bus.listen_once(EVENT_HOMEASSISTANT_START, open_browser) hass.bus.listen_once(EVENT_HOMEASSISTANT_START, open_browser)
hass.start() hass.start()