summaryrefslogtreecommitdiff
path: root/src/Propellor/Property
diff options
context:
space:
mode:
authorJoey Hess2018-11-10 17:14:36 -0400
committerJoey Hess2018-11-10 17:14:36 -0400
commite238c6d2df99213ab7c33fc4b4c81f8c3d617543 (patch)
tree98983510abeda13d90e6d3252791541c2ca56d78 /src/Propellor/Property
parent55286429de1106412394a1cde5647f91dc7569bf (diff)
parentd518203d0ea7f3b9ceefd37c007d059117efe22b (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'src/Propellor/Property')
-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"