summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/Debootstrap.hs
diff options
context:
space:
mode:
authorJoey Hess2016-03-25 18:39:50 -0400
committerJoey Hess2016-03-25 18:39:50 -0400
commitce8d34d094be30e1432ecaaae81b188671180624 (patch)
tree289e2bba5ca5291c14255c5b5fe6cf6d007a1bcf /src/Propellor/Property/Debootstrap.hs
parent860d1dd77e1789a91ed61bdceab667d94c9bd345 (diff)
ported more
Ssh is WIP and failing to compile quite badly
Diffstat (limited to 'src/Propellor/Property/Debootstrap.hs')
-rw-r--r--src/Propellor/Property/Debootstrap.hs8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Propellor/Property/Debootstrap.hs b/src/Propellor/Property/Debootstrap.hs
index 7cbf3d98..fd5f6c96 100644
--- a/src/Propellor/Property/Debootstrap.hs
+++ b/src/Propellor/Property/Debootstrap.hs
@@ -101,18 +101,18 @@ extractSuite (System (FreeBSD _) _) = Nothing
installed :: RevertableProperty Linux Linux
installed = install <!> remove
where
- install = withOS "debootstrap installed" $ \o os ->
+ install = withOS "debootstrap installed" $ \w o ->
ifM (liftIO $ isJust <$> programPath)
( return NoChange
- , ensureProperty o (installon os)
+ , ensureProperty w (installon o)
)
installon (Just (System (Debian _) _)) = aptinstall
installon (Just (System (Buntish _) _)) = aptinstall
installon _ = sourceInstall
- remove = withOS "debootstrap removed" $ \o os ->
- ensureProperty o (removefrom os)
+ remove = withOS "debootstrap removed" $ \w o ->
+ ensureProperty w (removefrom o)
removefrom (Just (System (Debian _) _)) = aptremove
removefrom (Just (System (Buntish _) _)) = aptremove
removefrom _ = sourceRemove