diff options
| author | Joey Hess <joey@kitenet.net> | 2014-07-17 23:32:29 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-07-17 23:33:10 -0400 |
| commit | 55a638ad4c7605041ece96843a1d608d40c2984d (patch) | |
| tree | 2ff6abb26da843c8ec22b64d8b7fe7d984093653 | |
| parent | c65e9adc7f2cbd80df3f58f188a8efa9bdf42b45 (diff) | |
Fix bug in File.containsLines that caused lines that were already in the file to sometimes be appended to the end.
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | src/Propellor/Property/File.hs | 6 | ||||
| -rw-r--r-- | src/Propellor/Property/SiteSpecific/JoeySites.hs | 2 |
3 files changed, 10 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog index 54923662..5e5460e3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +propellor (0.8.2) UNRELEASED; urgency=medium + + * Fix bug in File.containsLines that caused lines that were already in the + file to sometimes be appended to the end. + + -- Joey Hess <joeyh@debian.org> Thu, 17 Jul 2014 23:32:01 -0400 + propellor (0.8.1) unstable; urgency=medium * Run apt-get update in initial bootstrap. diff --git a/src/Propellor/Property/File.hs b/src/Propellor/Property/File.hs index 07ac8c26..bc499e07 100644 --- a/src/Propellor/Property/File.hs +++ b/src/Propellor/Property/File.hs @@ -41,11 +41,9 @@ containsLine :: FilePath -> Line -> Property f `containsLine` l = f `containsLines` [l] containsLines :: FilePath -> [Line] -> Property -f `containsLines` l = fileProperty (f ++ " contains:" ++ show l) go f +f `containsLines` ls = fileProperty (f ++ " contains:" ++ show ls) go f where - go ls - | all (`elem` ls) l = ls - | otherwise = ls++l + go content = content ++ filter (`notElem` content) ls -- | Ensures that a line is not present in a file. -- Note that the file is ensured to exist, so if it doesn't, an empty diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index e00c3191..a4d335e3 100644 --- a/src/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs @@ -465,7 +465,7 @@ kiteMailServer = propertyList "kitenet.net mail server" , "smtp_use_tls = yes" , "smtp_tls_session_cache_database = sdbm:/etc/postfix/smtp_scache" ] - -- `onChange` Postfix.dedupMainCf + `onChange` Postfix.dedupMainCf `onChange` Service.restarted "postfix" `describe` "postfix configured" , Apt.serviceInstalledRunning "dovecot-imapd" |