summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/Sbuild.hs
diff options
context:
space:
mode:
authorJoey Hess2017-10-25 11:48:50 -0400
committerJoey Hess2017-10-25 11:48:50 -0400
commit628f239e0dab82cee2c1b9a1f2818695990df122 (patch)
treeb9260f539dcf6eb126a6e0476528364eb81ab600 /src/Propellor/Property/Sbuild.hs
parentc693c11b69cfa18d30fbadefbea257bf62c314a6 (diff)
parentb437fa963d7e44945d24c1c5a6453cebcaf7a682 (diff)
Merge remote-tracking branch 'nicolas/ignore-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