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

Merge branch 'master' into proxy

Browse source
This commit is contained in:
Joey Hess 2024-06-10 14:26:18 -04:00
commit 649b87bedd
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
16 changed files with 159 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Remote/Helper/Ssh.hs
View file

@ -239,9 +239,9 @@ openP2PSshConnection r connpool = do
Nothing -> do
liftIO $ rememberunsupported
return Nothing
Just (cmd, params) -> start cmd params =<< getRepo r
Just (cmd, params) -> start cmd params
where
start cmd params repo = liftIO $ do
start cmd params = liftIO $ do
(Just from, Just to, Nothing, pid) <- createProcess $
(proc cmd (toCommand params))
{ std_in = CreatePipe
@ -249,7 +249,7 @@ openP2PSshConnection r connpool = do
}
pidnum <- getPid pid
let conn = P2P.P2PConnection
{ P2P.connRepo = repo
{ P2P.connRepo = Nothing
, P2P.connCheckAuth = const False
, P2P.connIhdl = to
, P2P.connOhdl = from

2
Remote/P2P.hs
View file

@ -143,7 +143,7 @@ withConnection u addr connpool a = bracketOnError get cache go
openConnection :: UUID -> P2PAddress -> Annex Connection
openConnection u addr = do
g <- Annex.gitRepo
v <- liftIO $ tryNonAsync $ connectPeer g addr
v <- liftIO $ tryNonAsync $ connectPeer (Just g) addr
case v of
Right conn -> do
myuuid <- getUUID