summaryrefslogtreecommitdiff
path: root/Utility
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-07-26 11:52:49 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-07-26 11:52:49 -0400
commitcccdb448749de70d1769ecef79605e4f389f9c5d (patch)
treed7848f272ac1141c97df3923478036fcb7434ca5 /Utility
parentc4830aaa6cfd9b43f5a8c77975c6b6acf867a21a (diff)
git annex webapp --force forces a restart of the daemon
Useful for testing..
Diffstat (limited to 'Utility')
-rw-r--r--Utility/Daemon.hs2
-rw-r--r--Utility/WebApp.hs1
2 files changed, 1 insertions, 2 deletions
diff --git a/Utility/Daemon.hs b/Utility/Daemon.hs
index 8aa70d155..3386ea443 100644
--- a/Utility/Daemon.hs
+++ b/Utility/Daemon.hs
@@ -84,7 +84,7 @@ checkDaemon pidfile = do
| otherwise = error $
"stale pid in " ++ pidfile ++
" (got " ++ show pid' ++
- "; expected" ++ show pid ++ " )"
+ "; expected " ++ show pid ++ " )"
{- Stops the daemon, safely. -}
stopDaemon :: FilePath -> IO ()
diff --git a/Utility/WebApp.hs b/Utility/WebApp.hs
index 6936c6699..8a1887678 100644
--- a/Utility/WebApp.hs
+++ b/Utility/WebApp.hs
@@ -25,7 +25,6 @@ import Control.Exception
import Crypto.Random
import Data.Digest.Pure.SHA
import qualified Data.ByteString.Lazy as L
-import Data.List
import qualified Data.Text as T
import qualified Data.Text.Encoding as TE
import Blaze.ByteString.Builder.Char.Utf8 (fromText)