diff options
| author | Joey Hess <joey@kitenet.net> | 2014-04-17 20:05:41 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-04-17 20:05:41 -0400 |
| commit | 88b1724713b91fb7458ca527916247d0d53b9560 (patch) | |
| tree | d74292d9e11b5660a1a650e7b3fc7aa0878fcc30 /Propellor/Property/Obnam.hs | |
| parent | 312a9c3fc99ab16876b0edaf491a46c737d802b3 (diff) | |
| parent | d934c95b96ce5c770acf3482ab64383266cbb997 (diff) | |
Merge branch 'joeyconfig'
Diffstat (limited to 'Propellor/Property/Obnam.hs')
| -rw-r--r-- | Propellor/Property/Obnam.hs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Propellor/Property/Obnam.hs b/Propellor/Property/Obnam.hs index 1e861588..00e0bbef 100644 --- a/Propellor/Property/Obnam.hs +++ b/Propellor/Property/Obnam.hs @@ -46,7 +46,7 @@ backup dir crontimes params numclients = cronjob `describe` desc where desc = dir ++ " backed up by obnam" cronjob = Cron.niceJob ("obnam_backup" ++ dir) crontimes "root" "/" $ - intercalate ";" $ map flockcmd $ catMaybes + intercalate ";" $ catMaybes [ if numclients == OnlyClient then Just $ unwords $ [ "obnam" @@ -59,7 +59,6 @@ backup dir crontimes params numclients = cronjob `describe` desc , shellEscape dir ] ++ map shellEscape params ] - flockcmd cmd = "flock -n " ++ shellEscape dir ++ " " ++ cmd -- | Restores a directory from an obnam backup. -- |