saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #39900 from twangboy/win_fix_line

Browse source 
Namespace the line function properly in win_file
This commit is contained in:
Nicole Thomas 2017-03-09 15:19:11 -07:00 • committed by GitHub
commit a6f88d03df
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
salt/modules/win_file.py
View file

@ -64,7 +64,8 @@ from salt.modules.file import (check_hash, # pylint: disable=W0611
search, _get_flags, extract_hash, _error, _sed_esc, _psed,
RE_FLAG_TABLE, blockreplace, prepend, seek_read, seek_write, rename,
lstat, path_exists_glob, write, pardir, join, HASHES, HASHES_REVMAP,
comment, uncomment, _add_flags, comment_line, apply_template_on_contents)
comment, uncomment, _add_flags, comment_line, _regex_to_static,
_get_line_indent, apply_template_on_contents)
from salt.utils import namespaced_function as _namespaced_function
@ -86,12 +87,13 @@ def __virtual__():
global append, _error, directory_exists, touch, contains
global contains_regex, contains_glob, get_source_sum
global find, psed, get_sum, check_hash, get_hash, delete_backup
global get_diff, _get_flags, extract_hash, comment_line
global get_diff, line, _get_flags, extract_hash, comment_line
global access, copy, readdir, rmdir, truncate, replace, search
global _binary_replace, _get_bkroot, list_backups, restore_backup
global blockreplace, prepend, seek_read, seek_write, rename, lstat
global write, pardir, join, _add_flags, apply_template_on_contents
global path_exists_glob, comment, uncomment, _mkstemp_copy
global _regex_to_static, _get_line_indent
replace = _namespaced_function(replace, globals())
search = _namespaced_function(search, globals())
@ -128,6 +130,7 @@ def __virtual__():
check_hash = _namespaced_function(check_hash, globals())
get_hash = _namespaced_function(get_hash, globals())
get_diff = _namespaced_function(get_diff, globals())
line = _namespaced_function(line, globals())
access = _namespaced_function(access, globals())
copy = _namespaced_function(copy, globals())
readdir = _namespaced_function(readdir, globals())
@ -146,6 +149,8 @@ def __virtual__():
comment = _namespaced_function(comment, globals())
uncomment = _namespaced_function(uncomment, globals())
comment_line = _namespaced_function(comment_line, globals())
_regex_to_static = _namespaced_function(_regex_to_static, globals())
_get_line_indent = _namespaced_function(_get_line_indent, globals())
_mkstemp_copy = _namespaced_function(_mkstemp_copy, globals())
_add_flags = _namespaced_function(_add_flags, globals())
apply_template_on_contents = _namespaced_function(apply_template_on_contents, globals())