diff options
author | Jonathan Mainguy <jon@soh.re> | 2015-05-22 18:57:06 -0400 |
---|---|---|
committer | Jonathan Mainguy <jon@soh.re> | 2015-05-26 19:06:54 -0400 |
commit | 41049042de1fc302f05d668b58617a6d2b26a2ea (patch) | |
tree | 6a7afb3e4e6fc27e5af0fdf739d01c4c6f7b7ad5 | |
parent | b5399d34464475a9aa87c6b928628cd262022cd5 (diff) | |
download | ansible-modules-core-41049042de1fc302f05d668b58617a6d2b26a2ea.tar.gz |
remove blank lines from htpasswd file
used standard mktemp()
-rw-r--r-- | web_infrastructure/htpasswd.py | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/web_infrastructure/htpasswd.py b/web_infrastructure/htpasswd.py index 4a72ea37..03cd6a5b 100644 --- a/web_infrastructure/htpasswd.py +++ b/web_infrastructure/htpasswd.py @@ -198,6 +198,30 @@ def main(): if not passlib_installed: module.fail_json(msg="This module requires the passlib Python library") + # Check file for blank lines in effort to avoid "need more than 1 value to unpack" error. + f = open(path, "r") + try: + lines=f.readlines() + finally: + f.close + + # If the file gets edited, it returns true, so only edit the file if it has blank lines + strip = False + for line in lines: + if not line.strip(): + strip = True + + if strip: + # If check mode, create a temporary file + if check_mode: + temp = tempfile.NamedTemporaryFile() + path = temp.name + f = open(path,"w") + try: + [f.write(line) for line in lines if line.strip() ] + finally: + f.close + try: if state == 'present': (msg, changed) = present(path, username, password, crypt_scheme, create, check_mode) |