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

Merge branch '2016.3' into '2016.11'

Browse Source 
No conflicts.
This commit is contained in:
rallytime 2017-01-17 16:24:42 -07:00
commit 2aad54c49f
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
salt/config/__init__.py
View File

@ -1844,18 +1844,13 @@ def prepend_root_dir(opts, path_options):
'root_dir' option.
'''
root_dir = os.path.abspath(opts['root_dir'])
def_root_dir = salt.syspaths.ROOT_DIR
if def_root_dir.endswith(os.sep):
def_root_dir = def_root_dir.rstrip(os.sep)
root_opt = opts['root_dir'].rstrip(os.sep)
for path_option in path_options:
if path_option in opts:
path = opts[path_option]
if not os.path.isabs(path):
opts[path_option] = salt.utils.path_join(root_dir, path)
elif path.startswith(def_root_dir) and (root_dir != def_root_dir):
# Strip out the default root_dir and add the updated root_dir
path = path[len(def_root_dir):]
opts[path_option] = salt.utils.path_join(root_dir, path)
if path == root_opt or path.startswith(root_opt + os.sep):
path = path[len(root_opt):]
opts[path_option] = salt.utils.path_join(root_dir, path)
def insert_system_path(opts, paths):