valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Strip leading path separator characters in a portable way.

Browse Source 
Addresses the situation where get_id() ignores root_dir and always
looks for minion_id in /etc/salt/minion_id.

Fixes 10035
This commit is contained in:
Thayne Harbaugh 2014-01-29 14:16:28 -07:00 committed by Daniel Bradshaw
parent 8a53c925ea
commit 370522e2d5
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/config.py
View File

@ -1643,7 +1643,7 @@ def get_id(root_dir=None, minion_id=False, cache=True):
# Check for cached minion ID
id_cache = os.path.join(root_dir,
config_dir.lstrip('\\'),
config_dir.lstrip(os.path.sep),
'minion_id')
if cache: