mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

tested multi-daemon upgrade

Browse source
This commit is contained in:
Joey Hess 2013-11-24 15:20:18 -04:00
parent 95feec24d1
commit 12fd08be81
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Assistant/Threads/UpgradeWatcher.hs
View file

@ -77,8 +77,10 @@ handleUpgrade :: UrlRenderer -> Assistant ()
handleUpgrade urlrenderer = do handleUpgrade urlrenderer = do
-- Wait 2 minutes for any final upgrade changes to settle. -- Wait 2 minutes for any final upgrade changes to settle.
-- (For example, other associated files may be being put into -- (For example, other associated files may be being put into
-- place.) -- place.) Not needed when using a distribution bundle, because
liftIO $ threadDelaySeconds (Seconds 120) -- in that case git-annex handles the upgrade in a non-racy way.
liftIO $ unlessM usingDistribution $
threadDelaySeconds (Seconds 120)
ifM autoUpgradeEnabled ifM autoUpgradeEnabled
( do ( do
debug ["starting automatic upgrade"] debug ["starting automatic upgrade"]