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

replace horrible old daemon restart code with new method

Browse source
This commit is contained in:
Joey Hess 2013-11-23 15:50:17 -04:00
parent cf1f7eb185
commit b1a89c448a
7 changed files with 107 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Assistant/WebApp/Configurators/Local.hs
View file

@ -13,7 +13,7 @@ import Assistant.WebApp.Common
import Assistant.WebApp.Gpg
import Assistant.WebApp.MakeRemote
import Assistant.Sync
import Assistant.Upgrade
import Assistant.Restart
import Init
import qualified Git
import qualified Git.Construct

6
Assistant/WebApp/Configurators/Upgrade.hs
View file

@ -10,11 +10,10 @@
module Assistant.WebApp.Configurators.Upgrade where
import Assistant.WebApp.Common
import qualified Annex
import Types.Distribution
import Assistant.Upgrade
import Assistant.Restart
import Utility.HumanTime
import Git
import Config
import Data.Time.Clock
@ -31,8 +30,7 @@ getConfigStartUpgradeR d = page "Upgrade git-annex" (Just Configuration) $ do
getConfigFinishUpgradeR :: Handler Html
getConfigFinishUpgradeR = do
liftAssistant prepUpgrade
url <- liftIO . newAssistantUrl
=<< liftAnnex (repoLocation <$> Annex.gitRepo)
url <- liftAssistant runRestart
liftAssistant $ postUpgrade url
redirect url