From 7f8dc2425d918d75491047a9c5e7eabefc6beedd Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 17 Apr 2014 19:32:34 -0400
Subject: Revert "flock local directory to prevent multiple obnams stacking up"

This reverts commit ecf10abc478fefe239d469c2f03f05583ed4782b.
---
 Propellor/Property/Obnam.hs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'Propellor')

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.
 --
-- 
cgit v1.3-2-g0d8e