From d2406996c7d71f310be3d390d531812e3d0d4521 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 5 Dec 2015 19:29:15 -0400 Subject: refactor --- src/Propellor/Property/Locale.hs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'src/Propellor/Property/Locale.hs') diff --git a/src/Propellor/Property/Locale.hs b/src/Propellor/Property/Locale.hs index 15babf20..29de8df2 100644 --- a/src/Propellor/Property/Locale.hs +++ b/src/Propellor/Property/Locale.hs @@ -34,9 +34,13 @@ locale `selectedFor` vars = select deselect deselect' = cmdProperty "update-locale" vars `assume` MadeChange selectArgs = zipWith (++) vars (repeat ('=':locale)) - isselected = do - ls <- catchDefaultIO [] $ lines <$> readFile "/etc/default/locale" - return $ and $ map (\v -> v ++ "=" ++ locale `elem` ls) vars + isselected = locale `isSelectedFor` vars + +isSelectedFor :: Locale -> [LocaleVariable] -> IO Bool +locale `isSelectedFor` vars = do + ls <- catchDefaultIO [] $ lines <$> readFile "/etc/default/locale" + return $ and $ map (\v -> v ++ "=" ++ locale `elem` ls) vars + -- | Ensures a locale is generated (or, if reverted, ensure it's not). -- -- cgit v1.2.3