valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

#16991 Fixed pylint issues

Browse Source
This commit is contained in:
Daniel Hobley 2014-10-29 13:18:58 +01:00
parent 7c4414cd7a
commit f2d89c0b5c
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
salt/modules/mount.py
View File

@ -137,6 +137,7 @@ def _active_mounts_openbsd(ret):
'device_uuid': parens[0]}
return ret
def _active_mounts_darwin(ret):
'''
List active mounts on Mac OS systems
@ -149,6 +150,7 @@ def _active_mounts_darwin(ret):
'opts': parens[1:]}
return ret
def active(extended=False):
'''
List the active mounts.
@ -478,7 +480,6 @@ def set_automaster(
__salt__['file.touch'](config)
__salt__['file.append'](automaster_file, "/-\t\t\t{0}".format(config))
name = "/..{0}".format(name)
device_fmt = "{0}:{1}".format(fstype, device)
type_opts = "-fstype={0},{1}".format(fstype, opts)

2
salt/states/mount.py
View File

@ -482,7 +482,7 @@ def unmounted(name,
return ret
def mod_watch(name, **kwargs):
def mod_watch(name, user=None, **kwargs):
'''
The mounted watcher, called to invoke the watch command.