diff options
| author | Joey Hess <joeyh@joeyh.name> | 2015-09-14 20:11:25 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-09-14 20:11:25 -0400 |
| commit | 9a0169f0cbdf2470e149a32f5fab8ec2369686f3 (patch) | |
| tree | c8d4dc9f3a970b7ce3622370a8ff8ee8869b413c /src/Propellor/Property/File.hs | |
| parent | 115baccc7761356ec6633202e69dfff65f53a993 (diff) | |
clean up privdata excess/lacking newline issue
* PrivData converted to newtype (API change).
* Stopped stripping trailing newlines when setting PrivData;
this was previously done to avoid mistakes when pasting eg passwords
with an unwanted newline. Instead, PrivData consumers should use either
privDataLines or privDataVal, to extract respectively lines or a
value (without internal newlines) from PrivData.
Diffstat (limited to 'src/Propellor/Property/File.hs')
| -rw-r--r-- | src/Propellor/Property/File.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Propellor/Property/File.hs b/src/Propellor/Property/File.hs index 4e074eee..4563fe79 100644 --- a/src/Propellor/Property/File.hs +++ b/src/Propellor/Property/File.hs @@ -40,7 +40,7 @@ hasPrivContent' writer source f context = withPrivData source context $ \getcontent -> property desc $ getcontent $ \privcontent -> ensureProperty $ fileProperty' writer desc - (\_oldcontent -> lines privcontent) f + (\_oldcontent -> privDataLines privcontent) f where desc = "privcontent " ++ f |