diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2017-07-15 12:50:55 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2017-07-15 12:51:45 -0700 |
| commit | 6d43cd37c8a4b48aaca26cd2fa5db7b05df3751a (patch) | |
| tree | c5a46135ba47137091c1a22f23055968d6920c77 /src | |
| parent | cc021857bbfed0d728e538308b87eb00bdd63efb (diff) | |
assume cleanup property did nothing
Diffstat (limited to 'src')
| -rw-r--r-- | src/Propellor/Property/Sbuild.hs | 6 |
1 files changed, 4 insertions, 2 deletions
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" |