diff options
| author | Joey Hess <joeyh@joeyh.name> | 2014-12-09 00:05:34 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2014-12-09 00:05:34 -0400 |
| commit | 57520809299789956479256f68119a3043cf2f9a (patch) | |
| tree | eed478c5d3686e5504fecbead9fa47bfc9630e6e /src/Propellor/Property/Debootstrap.hs | |
| parent | 9841594c852bd7a663c25b961df11400557502f5 (diff) | |
| parent | 040a5fe3c75930f08667369357a77ededf815c5a (diff) | |
Merge branch 'joeyconfig'
Diffstat (limited to 'src/Propellor/Property/Debootstrap.hs')
| -rw-r--r-- | src/Propellor/Property/Debootstrap.hs | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/Propellor/Property/Debootstrap.hs b/src/Propellor/Property/Debootstrap.hs index 0181d58a..0a7308ff 100644 --- a/src/Propellor/Property/Debootstrap.hs +++ b/src/Propellor/Property/Debootstrap.hs @@ -148,18 +148,16 @@ sourceInstall = property "debootstrap installed from source" (liftIO sourceInsta `requires` arInstalled perlInstalled :: Property -perlInstalled = check (not <$> inPath "perl") $ property "perl installed" $ do - v <- liftIO $ firstM id +perlInstalled = check (not <$> inPath "perl") $ property "perl installed" $ + liftIO $ toResult . isJust <$> firstM id [ yumInstall "perl" ] - if isJust v then return MadeChange else return FailedChange arInstalled :: Property -arInstalled = check (not <$> inPath "ar") $ property "ar installed" $ do - v <- liftIO $ firstM id +arInstalled = check (not <$> inPath "ar") $ property "ar installed" $ + liftIO $ toResult . isJust <$> firstM id [ yumInstall "binutils" ] - if isJust v then return MadeChange else return FailedChange yumInstall :: String -> IO Bool yumInstall p = boolSystem "yum" [Param "-y", Param "install", Param p] |