diff options
| -rw-r--r-- | Command/Assistant.hs | 2 | ||||
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | debian/changelog | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/Command/Assistant.hs b/Command/Assistant.hs index 496df1dd2..8316a9948 100644 --- a/Command/Assistant.hs +++ b/Command/Assistant.hs @@ -14,6 +14,7 @@ import Annex.Init import Config.Files import qualified Build.SysConfig import Utility.HumanTime +import Assistant.Install import System.Environment @@ -50,6 +51,7 @@ start foreground stopdaemon autostart startdelay liftIO $ autoStart startdelay stop | otherwise = do + liftIO ensureInstalled ensureInitialized Command.Watch.start True foreground stopdaemon startdelay @@ -59,7 +59,8 @@ retest: git-annex # hothasktags chokes on some template haskell etc, so ignore errors tags: - find . | grep -v /.git/ | grep -v /tmp/ | grep -v /dist/ | grep -v /doc/ | egrep '\.hs$$' | xargs hothasktags > tags 2>/dev/null + grep -v '/\*' dist/build/autogen/cabal_macros.h > dist/build/autogen/cabal_macros.h.munged + (for f in $$(find . | grep -v /.git/ | grep -v /tmp/ | grep -v /dist/ | grep -v /doc/ | egrep '\.hs$$'); do hothasktags -c --include=dist/build/autogen/cabal_macros.h.munged $$f; done) 2>/dev/null | sort > tags # If ikiwiki is available, build static html docs suitable for being # shipped in the software package. diff --git a/debian/changelog b/debian/changelog index 48f795954..bf0650496 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,8 @@ git-annex (5.20140614) UNRELEASED; urgency=medium * Windows: Assistant now logs to daemon.log. * Fix bug in annex.queuesize calculation that caused much more 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 |