diff options
| author | Joey Hess <joeyh@joeyh.name> | 2014-12-07 14:49:12 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2014-12-07 14:49:12 -0400 |
| commit | 8c12047b6b6be67e086d60d79a95490598601a7a (patch) | |
| tree | 3bcddc5669a0806408505f744abc480619a2c2e2 /src | |
| parent | 6a906c8a4c63567e08521e2beb774cf4308944b9 (diff) | |
simplify using makeChange
Diffstat (limited to 'src')
| -rw-r--r-- | src/Propellor/Property/Debootstrap.hs | 5 | ||||
| -rw-r--r-- | src/Propellor/Property/Systemd.hs | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/Propellor/Property/Debootstrap.hs b/src/Propellor/Property/Debootstrap.hs index b4fd2654..0181d58a 100644 --- a/src/Propellor/Property/Debootstrap.hs +++ b/src/Propellor/Property/Debootstrap.hs @@ -93,9 +93,8 @@ built' installprop target system@(System _ arch) config = , return FailedChange ) - teardownprop = property ("removed debootstrapped " ++ target) $ liftIO $ do - removetarget - return MadeChange + teardownprop = property ("removed debootstrapped " ++ target) $ + makeChange removetarget removetarget = do submnts <- filter (\p -> simplifyPath p /= simplifyPath target) diff --git a/src/Propellor/Property/Systemd.hs b/src/Propellor/Property/Systemd.hs index a2130a21..9cb532e0 100644 --- a/src/Propellor/Property/Systemd.hs +++ b/src/Propellor/Property/Systemd.hs @@ -151,9 +151,8 @@ nspawnService (Container name _ _) cfg = RevertableProperty setup teardown <$> servicefilecontent <*> catchDefaultIO "" (readFile servicefile) - writeservicefile = property servicefile $ liftIO $ do + writeservicefile = property servicefile $ makeChange $ viaTmp writeFile servicefile =<< servicefilecontent - return MadeChange setupservicefile = check (not <$> goodservicefile) $ -- if it's running, it has the wrong configuration, |