diff options
| author | Joey Hess <joeyh@joeyh.name> | 2015-04-22 13:50:16 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-04-22 13:50:16 -0400 |
| commit | 66a8012a1a1086dd15c18e48fd95b27687d10c87 (patch) | |
| tree | 6e911e3dcaa1bb18528d22a190d8016f7a9e3d0e /src/Propellor/Property/File.hs | |
| parent | 0fc926934a8e5c736219d0a53790de2fd1e2b87c (diff) | |
| parent | 4bd933118d9ecb711b19a6db7b94f24c2733d1a2 (diff) | |
Merge branch 'joeyconfig'
Conflicts:
privdata.joey/privdata.gpg
Diffstat (limited to 'src/Propellor/Property/File.hs')
| -rw-r--r-- | src/Propellor/Property/File.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Propellor/Property/File.hs b/src/Propellor/Property/File.hs index 12d9202f..46704746 100644 --- a/src/Propellor/Property/File.hs +++ b/src/Propellor/Property/File.hs @@ -91,8 +91,8 @@ dirExists d = check (not <$> doesDirectoryExist d) $ property (d ++ " exists") $ makeChange $ createDirectoryIfMissing True d -- | Ensures that a file/dir has the specified owner and group. -ownerGroup :: FilePath -> UserName -> GroupName -> Property NoInfo -ownerGroup f owner group = property (f ++ " owner " ++ og) $ do +ownerGroup :: FilePath -> User -> Group -> Property NoInfo +ownerGroup f (User owner) (Group group) = property (f ++ " owner " ++ og) $ do r <- ensureProperty $ cmdProperty "chown" [og, f] if r == FailedChange then return r |