mirror of
https://github.com/valitydev/salt.git
synced 2024-11-08 17:33:54 +00:00
Merge pull request #5145 from UtahDave/fix_win_file
don't import get_user. Defined locally
This commit is contained in:
commit
8f083cf006
@ -45,7 +45,7 @@ def __virtual__():
|
|||||||
if salt.utils.is_windows():
|
if salt.utils.is_windows():
|
||||||
if HAS_WINDOWS_MODULES:
|
if HAS_WINDOWS_MODULES:
|
||||||
global check_perms, get_managed, makedirs_perms, manage_file
|
global check_perms, get_managed, makedirs_perms, manage_file
|
||||||
global source_list, mkdir, __clean_tmp, get_user, makedirs
|
global source_list, mkdir, __clean_tmp, makedirs
|
||||||
|
|
||||||
check_perms = namespaced_function(check_perms, globals())
|
check_perms = namespaced_function(check_perms, globals())
|
||||||
get_managed = namespaced_function(get_managed, globals())
|
get_managed = namespaced_function(get_managed, globals())
|
||||||
@ -54,7 +54,6 @@ def __virtual__():
|
|||||||
manage_file = namespaced_function(manage_file, globals())
|
manage_file = namespaced_function(manage_file, globals())
|
||||||
source_list = namespaced_function(source_list, globals())
|
source_list = namespaced_function(source_list, globals())
|
||||||
mkdir = namespaced_function(mkdir, globals())
|
mkdir = namespaced_function(mkdir, globals())
|
||||||
get_user = namespaced_function(get_user, globals())
|
|
||||||
__clean_tmp = namespaced_function(__clean_tmp, globals())
|
__clean_tmp = namespaced_function(__clean_tmp, globals())
|
||||||
|
|
||||||
return 'file'
|
return 'file'
|
||||||
|
Loading…
Reference in New Issue
Block a user