Merge pull request #5145 from UtahDave/fix_win_file

don't import get_user. Defined locally
This commit is contained in:
David Boucha 2013-05-19 12:09:14 -07:00
commit 8f083cf006

View File

@ -45,7 +45,7 @@ def __virtual__():
if salt.utils.is_windows():
if HAS_WINDOWS_MODULES:
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())
get_managed = namespaced_function(get_managed, globals())
@ -54,7 +54,6 @@ def __virtual__():
manage_file = namespaced_function(manage_file, globals())
source_list = namespaced_function(source_list, globals())
mkdir = namespaced_function(mkdir, globals())
get_user = namespaced_function(get_user, globals())
__clean_tmp = namespaced_function(__clean_tmp, globals())
return 'file'