summaryrefslogtreecommitdiff
path: root/src/Propellor
diff options
context:
space:
mode:
authorSean Whitton2018-11-10 13:33:18 -0700
committerJoey Hess2018-11-10 17:14:30 -0400
commitd518203d0ea7f3b9ceefd37c007d059117efe22b (patch)
treeeb5e0c9fb9568406252aa60803bd8029a6d8fcfa /src/Propellor
parent6896b051074107fe1ba6de4e0fe5bc6a19cbf311 (diff)
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 <spwhitton@spwhitton.name>
Diffstat (limited to 'src/Propellor')
-rw-r--r--src/Propellor/Property/User.hs2
1 files changed, 1 insertions, 1 deletions
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"