mirror of
https://github.com/gnuradio/gnuradio-companion.git
synced 2025-12-10 17:46:12 -06:00
GRC: config directory creation shouldn't create dir named as config file
- we want to make a directory to to contain the file grc.conf, newpath is the full pathname with the file included. Make the directory without using newpath as it creates directories $HOME/.config/gnuradio/grc.conf. - In exception block we need to run os.makedirs on the directory part of the path only. Signed-off-by: Chris Gorman <chrisjohgorman@gmail.com>
This commit is contained in:
parent
ad4b5440d6
commit
504102b4b9
9
main.py
9
main.py
@ -14,6 +14,7 @@ import logging.handlers
|
|||||||
import os
|
import os
|
||||||
import platform
|
import platform
|
||||||
import sys
|
import sys
|
||||||
|
from pathlib import Path
|
||||||
|
|
||||||
|
|
||||||
VERSION_AND_DISCLAIMER_TEMPLATE = """\
|
VERSION_AND_DISCLAIMER_TEMPLATE = """\
|
||||||
@ -201,7 +202,9 @@ def get_config_file_path(config_file: str = "grc.conf") -> str:
|
|||||||
return oldpath
|
return oldpath
|
||||||
# Default to the correct path if both are configured.
|
# Default to the correct path if both are configured.
|
||||||
# neither old, nor new path exist: create new path, return that
|
# neither old, nor new path exist: create new path, return that
|
||||||
os.makedirs(newpath, exist_ok=True)
|
path_parts = Path(newpath).parts[:-1]
|
||||||
|
pathdir = os.path.join(*path_parts)
|
||||||
|
os.makedirs(pathdir, exist_ok=True)
|
||||||
return newpath
|
return newpath
|
||||||
except ImportError:
|
except ImportError:
|
||||||
log.warn("Could not retrieve GNU Radio configuration directory from GNU Radio. Trying defaults.")
|
log.warn("Could not retrieve GNU Radio configuration directory from GNU Radio. Trying defaults.")
|
||||||
@ -214,7 +217,9 @@ def get_config_file_path(config_file: str = "grc.conf") -> str:
|
|||||||
f"files to '{newpath}'.")
|
f"files to '{newpath}'.")
|
||||||
return oldpath
|
return oldpath
|
||||||
# neither old, nor new path exist: create new path, return that
|
# neither old, nor new path exist: create new path, return that
|
||||||
os.makedirs(xdgcand, exist_ok=True)
|
path_parts = Path(xdgcand).parts[:-1]
|
||||||
|
pathdir = os.path.join(*path_parts)
|
||||||
|
os.makedirs(pathdir, exist_ok=True)
|
||||||
return xdgcand
|
return xdgcand
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user