From b437fa963d7e44945d24c1c5a6453cebcaf7a682 Mon Sep 17 00:00:00 2001 From: Nicolas Schodet Date: Thu, 19 Oct 2017 21:35:29 +0200 Subject: Use isUnpopulated when creating a chroot or restoring a backup --- src/Propellor/Property/Sbuild.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/Propellor/Property/Sbuild.hs') diff --git a/src/Propellor/Property/Sbuild.hs b/src/Propellor/Property/Sbuild.hs index 23f3b311..210fb20b 100644 --- a/src/Propellor/Property/Sbuild.hs +++ b/src/Propellor/Property/Sbuild.hs @@ -147,7 +147,7 @@ built s@(SbuildSchroot suite arch) mirror cc = deleted where go :: Property DebianLike - go = check (unpopulated (schrootRoot s) <||> ispartial) $ + go = check (isUnpopulated (schrootRoot s) <||> ispartial) $ property' ("built sbuild schroot for " ++ val s) make make w = do de <- liftIO standardPathEnv @@ -166,7 +166,7 @@ built s@(SbuildSchroot suite arch) mirror cc = ) -- TODO we should kill any sessions still using the chroot -- before destroying it (as suggested by sbuild-destroychroot) - deleted = check (not <$> unpopulated (schrootRoot s)) $ + deleted = check (not <$> isUnpopulated (schrootRoot s)) $ property ("no sbuild schroot for " ++ val s) $ do liftIO $ removeChroot $ schrootRoot s liftIO $ nukeFile -- cgit v1.2.3