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

avoid head

Browse source
This commit is contained in:
Joey Hess 2012-08-05 15:08:58 -04:00
commit ac71ab7bd7
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Assistant/Threads/MountWatcher.hs
View file

@ -98,11 +98,11 @@ checkMountMonitor :: Client -> IO Bool
checkMountMonitor client = do checkMountMonitor client = do
running <- filter (`elem` usableservices) running <- filter (`elem` usableservices)
<$> listServiceNames client <$> listServiceNames client
if null running case running of
then startOneService client startableservices [] -> startOneService client startableservices
else do (service:_) -> do
debug thisThread [ "Using running DBUS service" debug thisThread [ "Using running DBUS service"
, Prelude.head running , service
, "to monitor mount events." , "to monitor mount events."
] ]
return True return True

4
Utility/WebApp.hs
View file

@ -67,7 +67,9 @@ runWebApp app observer = do
localSocket :: IO Socket localSocket :: IO Socket
localSocket = do localSocket = do
addrs <- getAddrInfo (Just hints) (Just localhost) Nothing addrs <- getAddrInfo (Just hints) (Just localhost) Nothing
go $ Prelude.head addrs case addrs of
[] -> error "unable to bind to a local socket"
(addr:_) -> go addr
where where
hints = defaultHints hints = defaultHints
{ addrFlags = [AI_ADDRCONFIG] { addrFlags = [AI_ADDRCONFIG]