diff options
| author | Joey Hess <id@joeyh.name> | 2014-12-05 17:44:14 -0400 |
|---|---|---|
| committer | Joey Hess <id@joeyh.name> | 2014-12-05 17:44:14 -0400 |
| commit | 9805f132ac6440bb8c2ca5957101db2cb59428c7 (patch) | |
| tree | f3f5a4aa009bc573b800cee89118afba00981101 /src/Propellor/Property/Debootstrap.hs | |
| parent | dbc76b1e5225a28b84efa14659ff1c0c1d5fc463 (diff) | |
| parent | 5ae6a302df5c7bd71cd5dadb53e5bb5e710762b3 (diff) | |
Merge branch 'joeyconfig'
Diffstat (limited to 'src/Propellor/Property/Debootstrap.hs')
| -rw-r--r-- | src/Propellor/Property/Debootstrap.hs | 9 |
1 files changed, 7 insertions, 2 deletions
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 |