From efeb73055e557a9fe594323a54d6c959506c3141 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Sat, 21 May 2016 22:11:41 +0900 Subject: refactor --- src/Propellor/Property/Sbuild.hs | 6 ++---- 1 file 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" -- cgit v1.2.3