Strip trailing comments from /etc/default/passwd (#43931) (#44367)

* strip additional comments from /etc/default/passwd

Strip trailling comments from /etc/default/passwd like
MINWEEKS=1 #MINWEEKS=2
MAXWEEKS=12  # MAXWEEKS=8
Which otherwise cause failures with "failed to read /etc/default/passwd: too many values to unpack"

* fix carriage return typo in commit

* yet another typo in commit

* Fix indent problem

* add changelog fragment for PR 43931

(cherry picked from commit 5c1e620504)
pull/45257/head
Tom Matthews 6 years ago committed by Matt Davis
parent 3f80b6ccb1
commit 8854f77d67

@ -0,0 +1,2 @@
bugfixes:
- user - Strip trailing comments in /etc/default/passwd (https://github.com/ansible/ansible/pull/43931)

@ -329,6 +329,7 @@ import pwd
import shutil import shutil
import socket import socket
import time import time
import re
from ansible.module_utils._text import to_native from ansible.module_utils._text import to_native
from ansible.module_utils.basic import load_platform_subclass, AnsibleModule from ansible.module_utils.basic import load_platform_subclass, AnsibleModule
@ -1415,6 +1416,9 @@ class SunOS(User):
line = line.strip() line = line.strip()
if (line.startswith('#') or line == ''): if (line.startswith('#') or line == ''):
continue continue
m = re.match(r'^([^#]*)#(.*)$', line)
if m: # The line contains a hash / comment
line = m.group(1)
key, value = line.split('=') key, value = line.split('=')
if key == "MINWEEKS": if key == "MINWEEKS":
minweeks = value.rstrip('\n') minweeks = value.rstrip('\n')

Loading…
Cancel
Save