fixing saltenv if not set in url

This commit is contained in:
Nevins Bartolomeo 2016-10-21 08:38:17 -04:00
parent a9683cbbd8
commit 3315b67075

View file

@ -2396,6 +2396,8 @@ def recurse(name,
# Check source path relative to fileserver root, make sure it is a
# directory
srcpath, senv = salt.utils.url.parse(source)
if senv is None:
senv = __env__
master_dirs = __salt__['cp.list_master_dirs'](saltenv=senv)
if srcpath not in master_dirs \
and not any((x for x in master_dirs