From d518203d0ea7f3b9ceefd37c007d059117efe22b Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Sat, 10 Nov 2018 13:33:18 -0700 Subject: User.hasDesktopGroups uses combineProperties Propellor's output should not include a line for every single group the user is added to, but a single line indicating that they have been added to the desktop groups. Signed-off-by: Sean Whitton --- src/Propellor/Property/User.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/Propellor/Property/User.hs b/src/Propellor/Property/User.hs index 0b5bdddc..f6bc2c4b 100644 --- a/src/Propellor/Property/User.hs +++ b/src/Propellor/Property/User.hs @@ -168,7 +168,7 @@ hasDesktopGroups user@(User u) = property' desc $ \o -> do existinggroups <- map (fst . break (== ':')) . lines <$> liftIO (readFile "/etc/group") let toadd = filter (`elem` existinggroups) desktopgroups - ensureProperty o $ propertyList desc $ toProps $ + ensureProperty o $ combineProperties desc $ toProps $ map (hasGroup user . Group) toadd where desc = "user " ++ u ++ " is in standard desktop groups" -- cgit v1.2.3