diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-11-24 15:20:18 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-11-24 15:20:18 -0400 |
| commit | 1118520b9d513da5ed54e544f93b8c5aa6c21a21 (patch) | |
| tree | 46fc0308750892046cc5a4f818732a160cc93903 /Assistant | |
| parent | 1f82c755b61f92156d7c159d22926cdca9b63ee1 (diff) | |
tested multi-daemon upgrade
Diffstat (limited to 'Assistant')
| -rw-r--r-- | Assistant/Threads/UpgradeWatcher.hs | 6 |
1 files changed, 4 insertions, 2 deletions
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"] |