Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Juju config directory location fix on 3.x #976

Merged
merged 4 commits into from
Oct 26, 2023
Merged

Juju config directory location fix on 3.x #976

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
927cb8e
Fix location for juju config directory pointed by XDG_DATA_HOME
cderici Oct 26, 2023
c1ede8d
Handle juju config dirs with pathlib
cderici Oct 26, 2023
1120738
Avoid setting None in Path objects -- fix unit tests
cderici Oct 26, 2023
49d3e86
Merge branch 'master' into juju-config-dir-fix-3.x
cderici Oct 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 9 additions & 10 deletions juju/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,18 +47,17 @@ def juju_config_dir():
* ~/.local/share/juju

"""
# Check $JUJU_DATA first
config_dir = os.environ.get('JUJU_DATA', None)
# Set it to ~/.local/share/juju as default
config_dir = Path('~/.local/share/juju')

# Second option: $XDG_DATA_HOME for ~/.local/share
if not config_dir:
config_dir = os.environ.get('XDG_DATA_HOME', None)
# Check $JUJU_DATA
if juju_data := os.environ.get('JUJU_DATA'):
config_dir = Path(juju_data)
# Secondly check: $XDG_DATA_HOME for ~/.local/share
elif xdg_data_home := os.environ.get('XDG_DATA_HOME'):
config_dir = Path(xdg_data_home) / 'juju'

# Third option: just set it to ~/.local/share/juju
if not config_dir:
config_dir = '~/.local/share/juju'

return os.path.abspath(os.path.expanduser(config_dir))
return str(config_dir.expanduser().resolve())


def juju_ssh_key_paths():
Expand Down
Loading