summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/Sbuild.hs
diff options
context:
space:
mode:
authorSean Whitton2016-05-21 22:11:41 +0900
committerSean Whitton2016-05-21 22:11:41 +0900
commitefeb73055e557a9fe594323a54d6c959506c3141 (patch)
tree4787a8f522a01ab71affb041ab73b110bc454c5f /src/Propellor/Property/Sbuild.hs
parent36d005c1bb298d4cf8cf274680d41b90c2425f87 (diff)
refactor
Diffstat (limited to 'src/Propellor/Property/Sbuild.hs')
-rw-r--r--src/Propellor/Property/Sbuild.hs6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/Propellor/Property/Sbuild.hs b/src/Propellor/Property/Sbuild.hs
index 21a1fc8d..2fa46216 100644
--- a/src/Propellor/Property/Sbuild.hs
+++ b/src/Propellor/Property/Sbuild.hs
@@ -252,7 +252,8 @@ piupartsConf s u = go
where
go :: Property DebianLike
go = tightenTargets $
- check (not <$> doesFileExist f) create
+ check (not <$> doesFileExist f)
+ (File.basedOn f (schrootConf s, map munge))
`before`
ConfFile.containsIniSetting f (sec, "profile", "piuparts")
`before`
@@ -271,9 +272,6 @@ piupartsConf s u = go
File.basedOn (dir </> "fstab")
(orig </> "fstab", filter (/= aptCacheLine))
- create = cmdProperty "cp" [schrootConf s, f] `assume` MadeChange
- `before` File.fileProperty "replace suffix" (map munge) f
-
orig = "/etc/schroot/chroot.d/sbuild"
dir = "/etc/schroot/chroot.d/piuparts"
sec = show s ++ "-piuparts"