From c9d1cc0ce36939e94a83e84e6cb9bc043d11d55a Mon Sep 17 00:00:00 2001 From: Jonathan Mainguy Date: Fri, 22 May 2015 18:57:06 -0400 Subject: [PATCH] remove blank lines from htpasswd file used standard mktemp() --- .../modules/web_infrastructure/htpasswd.py | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/lib/ansible/modules/web_infrastructure/htpasswd.py b/lib/ansible/modules/web_infrastructure/htpasswd.py index fce8b062d1c..274f8fa38b2 100644 --- a/lib/ansible/modules/web_infrastructure/htpasswd.py +++ b/lib/ansible/modules/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)