Fix for when the password file did not exist previously
This commit is contained in:
parent
ed279d8175
commit
cb776e6190
1 changed files with 26 additions and 19 deletions
|
@ -78,6 +78,7 @@ EXAMPLES = """
|
|||
|
||||
|
||||
import os
|
||||
import tempfile
|
||||
from distutils.version import StrictVersion
|
||||
|
||||
try:
|
||||
|
@ -199,17 +200,23 @@ def main():
|
|||
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.
|
||||
try:
|
||||
f = open(path, "r")
|
||||
except IOError:
|
||||
# No preexisting file to remove blank lines from
|
||||
f = None
|
||||
else:
|
||||
try:
|
||||
lines = f.readlines()
|
||||
finally:
|
||||
f.close
|
||||
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
|
||||
break
|
||||
|
||||
if strip:
|
||||
# If check mode, create a temporary file
|
||||
|
@ -220,7 +227,7 @@ def main():
|
|||
try:
|
||||
[ f.write(line) for line in lines if line.strip() ]
|
||||
finally:
|
||||
f.close
|
||||
f.close()
|
||||
|
||||
try:
|
||||
if state == 'present':
|
||||
|
|
Loading…
Reference in a new issue