diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2016-05-22 08:35:58 +0900 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2016-05-22 09:34:01 +0900 |
| commit | 0a5bd1b3ff4f211db9d29ce2a1b9271e836268f6 (patch) | |
| tree | a9f00ae1b8c899f764c83f7c9a5adc25d49fba17 /src | |
| parent | b506db88f0914e31d3bf1d7e261bf9b375fb6d92 (diff) | |
hasGroupCache -> hasCache
I was originally thinking that the name `Ccache.hasCache` might be for a
property `User -> Property DebianLike`. However, someone wanted to
write a property configuring a user cache, it would probably have the
standard location `~/.ccache`. This cache would be implicitly created
when required, so the name `Ccache.hasCache` would be needed.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Propellor/Property/Ccache.hs | 4 | ||||
| -rw-r--r-- | src/Propellor/Property/Sbuild.hs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/Propellor/Property/Ccache.hs b/src/Propellor/Property/Ccache.hs index f511def7..b721e684 100644 --- a/src/Propellor/Property/Ccache.hs +++ b/src/Propellor/Property/Ccache.hs @@ -33,8 +33,8 @@ data Limit -- wish to limit both the maximum size of the cache and the maximum number of -- files in the cache. However, setting only one of these two limits is -- generally sufficient. -hasGroupCache :: Group -> Limit -> RevertableProperty DebianLike UnixLike -group@(Group g) `hasGroupCache` limit = (make `requires` installed) <!> delete +hasCache :: Group -> Limit -> RevertableProperty DebianLike UnixLike +group@(Group g) `hasCache` limit = (make `requires` installed) <!> delete where make = propertyList ("ccache for " ++ g ++ " group exists") $ props & File.dirExists path diff --git a/src/Propellor/Property/Sbuild.hs b/src/Propellor/Property/Sbuild.hs index fe22c038..df9c5a37 100644 --- a/src/Propellor/Property/Sbuild.hs +++ b/src/Propellor/Property/Sbuild.hs @@ -313,7 +313,7 @@ keypairGenerated = check (not <$> doesFileExist secKeyFile) $ go -- another script from wiki.d.o/sbuild ccachePrepared :: Property DebianLike ccachePrepared = propertyList "sbuild group ccache configured" $ props - & Group "sbuild" `Ccache.hasGroupCache` (Ccache.MaxSize "2G") + & Group "sbuild" `Ccache.hasCache` (Ccache.MaxSize "2G") & "/etc/schroot/sbuild/fstab" `File.containsLine` "/var/cache/ccache-sbuild /var/cache/ccache-sbuild none rw,bind 0 0" `describe` "ccache mounted in sbuild schroots" |