diff options
| author | Joey Hess <joey@kitenet.net> | 2014-04-17 19:32:23 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-04-17 19:32:23 -0400 |
| commit | 312a9c3fc99ab16876b0edaf491a46c737d802b3 (patch) | |
| tree | 0e397292539937cddffe423ceddb8a70bfceedd5 | |
| parent | 763c65b84f9505b3b2e98b982e2e6cdaf5b662bc (diff) | |
| parent | ecf10abc478fefe239d469c2f03f05583ed4782b (diff) | |
Merge branch 'joeyconfig'
| -rw-r--r-- | Propellor/Property/Obnam.hs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Propellor/Property/Obnam.hs b/Propellor/Property/Obnam.hs index 00e0bbef..1e861588 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 ";" $ catMaybes + intercalate ";" $ map flockcmd $ catMaybes [ if numclients == OnlyClient then Just $ unwords $ [ "obnam" @@ -59,6 +59,7 @@ 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. -- |