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

typo

Browse source
This commit is contained in:
Joey Hess 2016-12-18 17:13:06 -04:00
parent 7f2e7fa271
commit 249ddb5953
No known key found for this signature in database
GPG key ID: C910D9222512E3C7
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Command/P2P.hs
View file

@ -166,7 +166,7 @@ performPairing remotename addrs = do
case Wormhole.toCode l of case Wormhole.toCode l of
Just code Just code
| code /= ourcode -> do | code /= ourcode -> do
putStrLn "Pairing in process..." putStrLn "Exchanging pairing data..."
return code return code
| otherwise -> do | otherwise -> do
putStrLn "Oops -- You entered this repository's pairing code. We need the pairing code of the *other* repository." putStrLn "Oops -- You entered this repository's pairing code. We need the pairing code of the *other* repository."
@ -258,7 +258,7 @@ finishPairing :: Int -> RemoteName -> HalfAuthToken -> PairData -> Annex Pairing
finishPairing retries remotename (HalfAuthToken ourhalf) (PairData (HalfAuthToken theirhalf) theiraddrs) = do finishPairing retries remotename (HalfAuthToken ourhalf) (PairData (HalfAuthToken theirhalf) theiraddrs) = do
case (toAuthToken (ourhalf <> theirhalf), toAuthToken (theirhalf <> ourhalf)) of case (toAuthToken (ourhalf <> theirhalf), toAuthToken (theirhalf <> ourhalf)) of
(Just ourauthtoken, Just theirauthtoken) -> do (Just ourauthtoken, Just theirauthtoken) -> do
liftIO $ putStrLn $ "Successfully exchanged pairing data. Connecting to " ++ remotename ++ " ..." liftIO $ putStrLn $ "Successfully exchanged pairing data. Connecting to " ++ remotename ++ "..."
storeP2PAuthToken ourauthtoken storeP2PAuthToken ourauthtoken
go retries theiraddrs theirauthtoken go retries theiraddrs theirauthtoken
_ -> return ReceiveFailed _ -> return ReceiveFailed

2
Utility/Tor.hs
View file

@ -70,7 +70,7 @@ addHiddenService uid ident = do
-- service and generate the hostname file for it. -- service and generate the hostname file for it.
reloaded <- anyM (uncurry boolSystem) reloaded <- anyM (uncurry boolSystem)
[ ("systemctl", [Param "reload", Param "tor"]) [ ("systemctl", [Param "reload", Param "tor"])
, ("sefvice", [Param "tor", Param "reload"]) , ("service", [Param "tor", Param "reload"])
] ]
unless reloaded $ unless reloaded $
giveup "failed to reload tor, perhaps the tor service is not running" giveup "failed to reload tor, perhaps the tor service is not running"