From 00ab24016453c1d787b7132654f96f614d177d27 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 5 Dec 2014 16:47:18 -0400 Subject: fix install of debootstrap from source --- src/Propellor/Property/Debootstrap.hs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'src/Propellor/Property/Debootstrap.hs') diff --git a/src/Propellor/Property/Debootstrap.hs b/src/Propellor/Property/Debootstrap.hs index 35d9e472..b4fd2654 100644 --- a/src/Propellor/Property/Debootstrap.hs +++ b/src/Propellor/Property/Debootstrap.hs @@ -2,7 +2,9 @@ module Propellor.Property.Debootstrap ( Url, DebootstrapConfig(..), built, + built', installed, + sourceInstall, programPath, ) where @@ -54,11 +56,14 @@ toParams (c1 :+ c2) = toParams c1 <> toParams c2 -- Note that reverting this property does not stop any processes -- currently running in the chroot. built :: FilePath -> System -> DebootstrapConfig -> RevertableProperty -built target system@(System _ arch) config = +built = built' (toProp installed) + +built' :: Property -> FilePath -> System -> DebootstrapConfig -> RevertableProperty +built' installprop target system@(System _ arch) config = RevertableProperty setup teardown where setup = check (unpopulated target <||> ispartial) setupprop - `requires` toProp installed + `requires` installprop teardown = check (not <$> unpopulated target) teardownprop -- cgit v1.2.3