Merge pull request #19412 from derekslager/develop

Making newer file module functions available on Windows, issue #19410.
This commit is contained in:
Thomas S Hatch 2015-01-07 10:11:11 -07:00
commit 50dc1da892

View File

@ -57,7 +57,7 @@ from salt.modules.file import (check_hash, # pylint: disable=W0611
access, copy, readdir, rmdir, truncate, replace, delete_backup,
search, _get_flags, extract_hash, _error, _sed_esc, _psed,
RE_FLAG_TABLE, blockreplace, prepend, seek_read, seek_write, rename,
lstat, path_exists_glob, HASHES)
lstat, path_exists_glob, write, pardir, join, HASHES)
from salt.utils import namespaced_function as _namespaced_function
@ -84,6 +84,7 @@ def __virtual__():
global _binary_replace, _get_bkroot, list_backups, restore_backup
global blockreplace, prepend, seek_read, seek_write, rename, lstat
global path_exists_glob
global write, pardir, join
replace = _namespaced_function(replace, globals())
search = _namespaced_function(search, globals())
@ -132,6 +133,9 @@ def __virtual__():
rename = _namespaced_function(rename, globals())
lstat = _namespaced_function(lstat, globals())
path_exists_glob = _namespaced_function(path_exists_glob, globals())
write = _namespaced_function(write, globals())
pardir = _namespaced_function(pardir, globals())
join = _namespaced_function(join, globals())
return __virtualname__
return False