moep
/
cdist
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #312 from asteven/issue/312 

all files cdist creates should allways end with newline
This commit is contained in:
Nico Schottelius 2014-05-04 08:50:30 +02:00
parent 99ce837d42 8a4cc56266
commit 1bb897f9a2
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cdist/util/fsproperty.py
View File

@ -143,6 +143,9 @@ class DirectoryDict(collections.MutableMapping):
fd.write(str(v) + '\n') fd.write(str(v) + '\n')
else: else:
fd.write(str(value)) fd.write(str(value))
# ensure file ends with a single newline
if value and value[-1] != '\n':
fd.write('\n')
except EnvironmentError as e: except EnvironmentError as e:
raise cdist.Error(str(e)) raise cdist.Error(str(e))
@ -281,7 +284,7 @@ class FileStringProperty(FileBasedProperty):
value = "" value = ""
try: try:
with open(path, "r") as fd: with open(path, "r") as fd:
value = fd.read() value = fd.read().rstrip('\n')
except EnvironmentError: except EnvironmentError:
pass pass
return value return value
@ -292,6 +295,9 @@ class FileStringProperty(FileBasedProperty):
try: try:
with open(path, "w") as fd: with open(path, "w") as fd:
fd.write(str(value)) fd.write(str(value))
# ensure file ends with a single newline
if value[-1] != '\n':
fd.write('\n')
except EnvironmentError as e: except EnvironmentError as e:
raise cdist.Error(str(e)) raise cdist.Error(str(e))
else: else: