Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Ophélie Gagnard
slapos.core
Commits
f15e0158
Commit
f15e0158
authored
Apr 29, 2013
by
Marco Mariani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
expand ~ in configuration path
parent
d134c8ef
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
slapos/cli/config.py
slapos/cli/config.py
+3
-2
No files found.
slapos/cli/config.py
View file @
f15e0158
...
@@ -54,16 +54,17 @@ class ConfigCommand(Command):
...
@@ -54,16 +54,17 @@ class ConfigCommand(Command):
def
fetch_config
(
self
,
args
):
def
fetch_config
(
self
,
args
):
if
args
.
cfg
:
if
args
.
cfg
:
cfg_path
=
os
.
path
.
expanduser
(
args
.
cfg
)
cfg_path
=
args_cfg
else
:
else
:
cfg_path
=
os
.
environ
.
get
(
self
.
default_config_var
,
self
.
default_config_path
)
cfg_path
=
os
.
environ
.
get
(
self
.
default_config_var
,
self
.
default_config_path
)
cfg_path
=
os
.
path
.
expanduser
(
cfg_path
)
self
.
log
.
debug
(
'Loading config: %s'
%
cfg_path
)
self
.
log
.
debug
(
'Loading config: %s'
%
cfg_path
)
return
self
.
_get_config
(
cfg_path
,
required
=
True
)
return
self
.
_get_config
(
cfg_path
,
required
=
True
)
class
ClientConfigCommand
(
ConfigCommand
):
class
ClientConfigCommand
(
ConfigCommand
):
# XXX does not fallback to SLAPOS_CONFIGURATION
default_config_var
=
'SLAPOS_CLIENT_CONFIGURATION'
default_config_var
=
'SLAPOS_CLIENT_CONFIGURATION'
default_config_path
=
'~/.slapos/slapos.cfg'
default_config_path
=
'~/.slapos/slapos.cfg'
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment