forked from mirrors/thatmattlove-hyperglass
ensure only one hyperglass directory exists
This commit is contained in:
parent
fbb42e7c5b
commit
70e39102b0
1 changed files with 10 additions and 3 deletions
|
|
@ -692,6 +692,13 @@ def set_app_path(required: bool = False) -> Path:
|
|||
|
||||
config_paths = (Path.home() / "hyperglass", Path("/etc/hyperglass/"))
|
||||
|
||||
# Ensure only one app directory exists to reduce confusion.
|
||||
if all((p.exists() for p in config_paths)):
|
||||
raise RuntimeError(
|
||||
"Both '{}' and '{}' exist. ".format(*(p.as_posix() for p in config_paths))
|
||||
+ "Please choose only one configuration directory and delete the other."
|
||||
)
|
||||
|
||||
for path in config_paths:
|
||||
try:
|
||||
if path.exists():
|
||||
|
|
@ -708,9 +715,9 @@ def set_app_path(required: bool = False) -> Path:
|
|||
# Only raise an error if required is True
|
||||
raise RuntimeError(
|
||||
"""
|
||||
No configuration directories were determined to both exist and be readable
|
||||
by hyperglass. hyperglass is running as user '{un}' (UID '{uid}'), and tried
|
||||
to access the following directories:
|
||||
No configuration directories were determined to both exist and be readable
|
||||
by hyperglass. hyperglass is running as user '{un}' (UID '{uid}'), and tried
|
||||
to access the following directories:
|
||||
{dir}""".format(
|
||||
un=getuser(),
|
||||
uid=os.getuid(),
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue