From 1118520b9d513da5ed54e544f93b8c5aa6c21a21 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 24 Nov 2013 15:20:18 -0400 Subject: tested multi-daemon upgrade --- Assistant/Threads/UpgradeWatcher.hs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'Assistant') diff --git a/Assistant/Threads/UpgradeWatcher.hs b/Assistant/Threads/UpgradeWatcher.hs index 80b11e71a..80f2040a0 100644 --- a/Assistant/Threads/UpgradeWatcher.hs +++ b/Assistant/Threads/UpgradeWatcher.hs @@ -77,8 +77,10 @@ handleUpgrade :: UrlRenderer -> Assistant () handleUpgrade urlrenderer = do -- Wait 2 minutes for any final upgrade changes to settle. -- (For example, other associated files may be being put into - -- place.) - liftIO $ threadDelaySeconds (Seconds 120) + -- place.) Not needed when using a distribution bundle, because + -- in that case git-annex handles the upgrade in a non-racy way. + liftIO $ unlessM usingDistribution $ + threadDelaySeconds (Seconds 120) ifM autoUpgradeEnabled ( do debug ["starting automatic upgrade"] -- cgit v1.2.3