Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #30 from akru/master

Build error fixes with the new haxr version, issue #29.
  • Loading branch information...
commit 29c684226eb2514182bf1bcdae0c4ca346ea166d 2 parents b2e7e65 + 675ca71
Anthony Cowley authored
Showing with 3 additions and 4 deletions.
  1. +1 −1  roshask.cabal
  2. +2 −3 src/Ros/Graph/Master.hs
2  roshask.cabal
View
@@ -112,7 +112,7 @@ Library
snap-server >= 0.9,
storable-tuple >= 0.0.2,
transformers >= 0.4,
- haxr >= 3000.10.3,
+ haxr >= 3000.10.4,
utf8-string >= 0.3.6,
uri >= 0.1.5,
vector-space,
5 src/Ros/Graph/Master.hs
View
@@ -5,9 +5,8 @@ import Network.XmlRpc.Client
import Ros.Internal.RosTypes
import Ros.Service.ServiceTypes
import Network.XmlRpc.Internals (fromValue, toValue)
-import Control.Monad.Except (ExceptT(..))
+import Control.Monad.Except (ExceptT(..), runExceptT)
import System.IO.Error (catchIOError)
-import Control.Monad.Error (runErrorT)
-- |Subscribe the caller to the specified topic. In addition to
-- receiving a list of current publishers, the subscriber will also
@@ -53,7 +52,7 @@ unregisterPublisher = flip remote "unregisterPublisher"
lookupService :: URI -> String -> ServiceName -> ExceptT ServiceResponseExcept IO (Int, String, String)
lookupService u s1 s2 = ExceptT . (flip catchIOError) handler $ do
let res = call u "lookupService" (fmap toValue [s1, s2]) >>= fromValue
- err <- runErrorT res
+ err <- runExceptT res
return $ case err of
Left x -> Left $ MasterExcept $ "Could not look up service with master. Got message: " ++ x
Right y -> Right y
Please sign in to comment.
Something went wrong with that request. Please try again.