mirror of
https://github.com/vale981/rmview
synced 2025-03-05 09:11:39 -05:00
Fixing intended config path priority
This commit is contained in:
parent
48e6dda35d
commit
7f5d7381d7
1 changed files with 2 additions and 1 deletions
|
@ -43,10 +43,11 @@ class rMViewApp(QApplication):
|
||||||
self.LOCAL_KNOWN_HOSTS = os.path.join(self.CONFIG_DIR, 'rmview_known_hosts')
|
self.LOCAL_KNOWN_HOSTS = os.path.join(self.CONFIG_DIR, 'rmview_known_hosts')
|
||||||
|
|
||||||
config_files = [] if len(args) < 2 else [args[1]]
|
config_files = [] if len(args) < 2 else [args[1]]
|
||||||
config_files += ['rmview.json', self.DEFAULT_CONFIG]
|
config_files += ['rmview.json']
|
||||||
rmview_conf = os.environ.get("RMVIEW_CONF")
|
rmview_conf = os.environ.get("RMVIEW_CONF")
|
||||||
if rmview_conf is not None:
|
if rmview_conf is not None:
|
||||||
config_files += [rmview_conf]
|
config_files += [rmview_conf]
|
||||||
|
config_files += [self.DEFAULT_CONFIG]
|
||||||
log.info("Searching configuration in " + ', '.join(config_files))
|
log.info("Searching configuration in " + ', '.join(config_files))
|
||||||
for f in config_files:
|
for f in config_files:
|
||||||
try:
|
try:
|
||||||
|
|
Loading…
Add table
Reference in a new issue