From 6d43cd37c8a4b48aaca26cd2fa5db7b05df3751a Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Sat, 15 Jul 2017 12:50:55 -0700 Subject: assume cleanup property did nothing --- src/Propellor/Property/Sbuild.hs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/Propellor/Property/Sbuild.hs b/src/Propellor/Property/Sbuild.hs index 35acb8bf..57dead3c 100644 --- a/src/Propellor/Property/Sbuild.hs +++ b/src/Propellor/Property/Sbuild.hs @@ -246,12 +246,14 @@ built s@(SbuildSchroot suite arch) mirror cc = -- clean up config from earlier versions of this module cleanupOldConfig :: Property UnixLike cleanupOldConfig = - property' "old sbuild module config cleaned up" $ \w -> do + property' "old sbuild module config cleaned up" $ \w -> do void $ ensureProperty w $ check (doesFileExist fstab) (File.lacksLine fstab aptCacheLine) void $ liftIO . tryIO $ removeDirectoryRecursive profile - makeChange $ nukeFile (schrootPiupartsConf s) + void $ liftIO $ nukeFile (schrootPiupartsConf s) + -- assume this did nothing + noChange where fstab = "/etc/schroot/sbuild/fstab" profile = "/etc/schroot/piuparts" -- cgit v1.2.3