carroarmato0/ansible.posix
1
0
Fork 0
mirror of https://github.com/ansible-collections/ansible.posix.git synced 2026-01-11 23:25:28 +01:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Improve PEP8 formatting."

Browse source 
This reverts commit f9837e4a07.
This commit is contained in:
Vladimir Botka 2024-11-21 20:41:03 +01:00
parent d702e0e2e1
commit e1cec6127f
No known key found for this signature in database
GPG key ID: 90D199128ED44F01
1 changed files with 37 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
plugins/modules/mount.py
View file

@ -239,8 +239,8 @@ def write_fstab(module, lines, path):
fs_w = open(path, 'w') fs_w = open(path, 'w')
for line in lines: for l in lines:
fs_w.write(line) fs_w.write(l)
fs_w.flush() fs_w.flush()
fs_w.close() fs_w.close()
@ -307,10 +307,10 @@ def _set_mount_save_old(module, args):
# Check if we got a valid line for splitting # Check if we got a valid line for splitting
# (on Linux the 5th and the 6th field is optional) # (on Linux the 5th and the 6th field is optional)
if any([ if (
platform.system() == 'SunOS' and len(fields) != 7, platform.system() == 'SunOS' and len(fields) != 7 or
platform.system() == 'Linux' and len(fields) not in [4, 5, 6], platform.system() == 'Linux' and len(fields) not in [4, 5, 6] or
platform.system() not in ['SunOS', 'Linux'] and len(fields) != 6]): platform.system() not in ['SunOS', 'Linux'] and len(fields) != 6):
to_write.append(line) to_write.append(line)
continue continue
@ -340,12 +340,12 @@ def _set_mount_save_old(module, args):
# Check if we found the correct line # Check if we found the correct line
if ( if (
ld['name'] != escaped_args['name'] or all([ ld['name'] != escaped_args['name'] or (
# In the case of swap, check the src instead # In the case of swap, check the src instead
'src' in args, 'src' in args and
ld['name'] == 'none', ld['name'] == 'none' and
ld['fstype'] == 'swap', ld['fstype'] == 'swap' and
ld['src'] != args['src']])): ld['src'] != args['src'])):
to_write.append(line) to_write.append(line)
continue continue
@ -397,9 +397,9 @@ def unset_mount(module, args):
continue continue
# Check if we got a valid line for splitting # Check if we got a valid line for splitting
if any([ if (
platform.system() == 'SunOS' and len(line.split()) != 7, platform.system() == 'SunOS' and len(line.split()) != 7 or
platform.system() != 'SunOS' and len(line.split()) != 6]): platform.system() != 'SunOS' and len(line.split()) != 6):
to_write.append(line) to_write.append(line)
continue continue
@ -427,12 +427,12 @@ def unset_mount(module, args):
) = line.split() ) = line.split()
if ( if (
ld['name'] != escaped_name or all([ ld['name'] != escaped_name or (
# In the case of swap, check the src instead # In the case of swap, check the src instead
'src' in args, 'src' in args and
ld['name'] == 'none', ld['name'] == 'none' and
ld['fstype'] == 'swap', ld['fstype'] == 'swap' and
ld['src'] != args['src']])): ld['src'] != args['src'])):
to_write.append(line) to_write.append(line)
continue continue
@ -449,10 +449,10 @@ def unset_mount(module, args):
def _set_fstab_args(fstab_file): def _set_fstab_args(fstab_file):
result = [] result = []
if all([ if (
fstab_file, fstab_file and
fstab_file != '/etc/fstab', fstab_file != '/etc/fstab' and
platform.system().lower() != 'sunos']): platform.system().lower() != 'sunos'):
if platform.system().lower().endswith('bsd'): if platform.system().lower().endswith('bsd'):
result.append('-F') result.append('-F')
else: else:
@ -640,10 +640,10 @@ def is_bind_mounted(module, linux_mounts, dest, src=None, fstype=None):
for mnt in mounts: for mnt in mounts:
arguments = mnt.split() arguments = mnt.split()
if all([ if (
(arguments[0] == src or src is None), (arguments[0] == src or src is None) and
arguments[2] == dest, arguments[2] == dest and
(arguments[4] == fstype or fstype is None)]): (arguments[4] == fstype or fstype is None)):
is_mounted = True is_mounted = True
if is_mounted: if is_mounted:
@ -690,7 +690,8 @@ def get_linux_mounts(module, mntinfo_file="/proc/self/mountinfo"):
if mnt['parent_id'] != 1 and mnt['parent_id'] in mntinfo: if mnt['parent_id'] != 1 and mnt['parent_id'] in mntinfo:
m = mntinfo[mnt['parent_id']] m = mntinfo[mnt['parent_id']]
if ( if (
len(m['root']) > 1 and mnt['root'].startswith("%s/" % m['root'])): len(m['root']) > 1 and
mnt['root'].startswith("%s/" % m['root'])):
# Omit the parent's root in the child's root # Omit the parent's root in the child's root
# == Example: # == Example:
# 140 136 253:2 /rootfs / rw - ext4 /dev/sdb2 rw # 140 136 253:2 /rootfs / rw - ext4 /dev/sdb2 rw
@ -726,9 +727,9 @@ def get_linux_mounts(module, mntinfo_file="/proc/self/mountinfo"):
def _is_same_mount_src(module, src, mountpoint, linux_mounts): def _is_same_mount_src(module, src, mountpoint, linux_mounts):
"""Return True if the mounted fs on mountpoint is the same source than src. Return False if mountpoint is not a mountpoint""" """Return True if the mounted fs on mountpoint is the same source than src. Return False if mountpoint is not a mountpoint"""
# If the provided mountpoint is not a mountpoint, don't waste time # If the provided mountpoint is not a mountpoint, don't waste time
if all([ if (
not ismount(mountpoint), not ismount(mountpoint) and
not is_bind_mounted(module, linux_mounts, mountpoint)]): not is_bind_mounted(module, linux_mounts, mountpoint)):
return False return False
# Treat Linux bind mounts # Treat Linux bind mounts
@ -862,7 +863,7 @@ def main():
try: try:
open(args['fstab'], 'a').close() open(args['fstab'], 'a').close()
except PermissionError as e: except PermissionError as e:
module.fail_json(msg="Failed to open %s due to permission issue %s" % (args['fstab'], to_native(e))) module.fail_json(msg="Failed to open %s due to permission issue" % args['fstab'])
except Exception as e: except Exception as e:
module.fail_json(msg="Failed to open %s due to %s" % (args['fstab'], to_native(e))) module.fail_json(msg="Failed to open %s due to %s" % (args['fstab'], to_native(e)))
@ -945,7 +946,10 @@ def main():
name, backup_lines, changed = args['name'], [], False name, backup_lines, changed = args['name'], [], False
res = 0 res = 0
if (ismount(name) or is_bind_mounted(module, linux_mounts, name, args['src'], args['fstype'])): if (
ismount(name) or
is_bind_mounted(
module, linux_mounts, name, args['src'], args['fstype'])):
if changed and not module.check_mode: if changed and not module.check_mode:
res, msg = remount(module, args) res, msg = remount(module, args)
changed = True changed = True