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

Run standalone install process when the assistant is started (was only being run when the webapp was opened).

Browse source 
I had thought that this was already done, but apparently not. There may
have been a reversion around version 5.20140606. Anna's laptop had its
desktop menu file etc having that version despite having upgraded git-annex
to a newer version. However, I could not find any commits that removed a
call to ensureInstalled.
This commit is contained in:
Joey Hess 2014-06-30 17:13:08 -04:00
parent d06aa50c58
commit 2e698ebcd4
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Command/Assistant.hs
View file

@ -14,6 +14,7 @@ import Annex.Init
import Config.Files import Config.Files
import qualified Build.SysConfig import qualified Build.SysConfig
import Utility.HumanTime import Utility.HumanTime
import Assistant.Install
import System.Environment import System.Environment
@ -50,6 +51,7 @@ start foreground stopdaemon autostart startdelay
liftIO $ autoStart startdelay liftIO $ autoStart startdelay
stop stop
| otherwise = do | otherwise = do
liftIO ensureInstalled
ensureInitialized ensureInitialized
Command.Watch.start True foreground stopdaemon startdelay Command.Watch.start True foreground stopdaemon startdelay

2
debian/changelog vendored
View file

@ -9,6 +9,8 @@ git-annex (5.20140614) UNRELEASED; urgency=medium
* Windows: Assistant now logs to daemon.log. * Windows: Assistant now logs to daemon.log.
* Fix bug in annex.queuesize calculation that caused much more * Fix bug in annex.queuesize calculation that caused much more
queue flushing than necessary. queue flushing than necessary.
* Run standalone install process when the assistant is started
(was only being run when the webapp was opened).
-- Joey Hess <joeyh@debian.org> Mon, 16 Jun 2014 11:28:42 -0400 -- Joey Hess <joeyh@debian.org> Mon, 16 Jun 2014 11:28:42 -0400