summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/Sbuild.hs
diff options
context:
space:
mode:
authorNicolas Schodet2017-10-19 21:35:29 +0200
committerNicolas Schodet2017-10-19 21:35:29 +0200
commitb437fa963d7e44945d24c1c5a6453cebcaf7a682 (patch)
tree1173ae1479f821876f42e1594371e4f501309678 /src/Propellor/Property/Sbuild.hs
parentd9f2eb343edfcdc66cf3f58cc6b7846cc3ca6b35 (diff)
Use isUnpopulated when creating a chroot or restoring a backupignore-lost-n-found
Diffstat (limited to 'src/Propellor/Property/Sbuild.hs')
-rw-r--r--src/Propellor/Property/Sbuild.hs4
1 files changed, 2 insertions, 2 deletions
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