diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-12-24 14:48:51 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-12-24 15:01:55 -0400 |
| commit | 42e08cd4575d3dc558dfe172c1f28c752d69e8c6 (patch) | |
| tree | 78a8eddc31c390aaf8f66435bb13db9366f9a7c4 /Assistant/Threads | |
| parent | 34f375526f44ff255d45bbabcd1425b3d5d0bb4a (diff) | |
| parent | 3b9d9a267b7c9247d36d9b622e1b836724ca5fb0 (diff) | |
Merge branch 'master' into no-xmpp
Diffstat (limited to 'Assistant/Threads')
| -rw-r--r-- | Assistant/Threads/Merger.hs | 4 | ||||
| -rw-r--r-- | Assistant/Threads/RemoteControl.hs | 2 | ||||
| -rw-r--r-- | Assistant/Threads/Watcher.hs | 4 | ||||
| -rw-r--r-- | Assistant/Threads/WebApp.hs | 5 |
4 files changed, 9 insertions, 6 deletions
diff --git a/Assistant/Threads/Merger.hs b/Assistant/Threads/Merger.hs index c38c2f375..4da8795f9 100644 --- a/Assistant/Threads/Merger.hs +++ b/Assistant/Threads/Merger.hs @@ -11,6 +11,8 @@ import Assistant.Common import Assistant.TransferQueue import Assistant.BranchChange import Assistant.Sync +import Assistant.DaemonStatus +import Assistant.ScanRemotes import Utility.DirWatcher import Utility.DirWatcher.Types import qualified Annex.Branch @@ -78,7 +80,7 @@ onChange file , "into", Git.fromRef b ] void $ liftAnnex $ Command.Sync.merge - currbranch mergeConfig + currbranch Command.Sync.mergeConfig Git.Branch.AutomaticCommit changedbranch mergecurrent _ = noop diff --git a/Assistant/Threads/RemoteControl.hs b/Assistant/Threads/RemoteControl.hs index 447b493c6..1aa8bc9c8 100644 --- a/Assistant/Threads/RemoteControl.hs +++ b/Assistant/Threads/RemoteControl.hs @@ -30,7 +30,7 @@ remoteControlThread :: NamedThread remoteControlThread = namedThread "RemoteControl" $ do program <- liftIO programPath (cmd, params) <- liftIO $ toBatchCommand - (program, [Param "remotedaemon"]) + (program, [Param "remotedaemon", Param "--foreground"]) let p = proc cmd (toCommand params) (Just toh, Just fromh, _, pid) <- liftIO $ createProcess p { std_in = CreatePipe diff --git a/Assistant/Threads/Watcher.hs b/Assistant/Threads/Watcher.hs index 1f50065b9..4b82a799d 100644 --- a/Assistant/Threads/Watcher.hs +++ b/Assistant/Threads/Watcher.hs @@ -65,10 +65,10 @@ checkCanWatch #else noop #endif - | otherwise = error "watch mode is not available on this system" + | otherwise = giveup "watch mode is not available on this system" needLsof :: Annex () -needLsof = error $ unlines +needLsof = giveup $ unlines [ "The lsof command is needed for watch mode to be safe, and is not in PATH." , "To override lsof checks to ensure that files are not open for writing" , "when added to the annex, you can use --force" diff --git a/Assistant/Threads/WebApp.hs b/Assistant/Threads/WebApp.hs index 5cc689595..928d0cdd3 100644 --- a/Assistant/Threads/WebApp.hs +++ b/Assistant/Threads/WebApp.hs @@ -38,6 +38,7 @@ import Assistant.WebApp.OtherRepos import Assistant.WebApp.Repair import Assistant.Types.ThreadedMonad import Utility.WebApp +import Utility.AuthToken import Utility.Tmp import Utility.FileMode import Git @@ -70,11 +71,11 @@ webAppThread assistantdata urlrenderer noannex cannotrun postfirstrun listenhost #ifdef __ANDROID__ when (isJust listenhost') $ -- See Utility.WebApp - error "Sorry, --listen is not currently supported on Android" + giveup "Sorry, --listen is not currently supported on Android" #endif webapp <- WebApp <$> pure assistantdata - <*> genAuthToken + <*> genAuthToken 128 <*> getreldir <*> pure staticRoutes <*> pure postfirstrun |