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

allow proxying to remotes that are nodes of clusters

Browse source 
fixes reversion in ca08f3fcc2
This commit is contained in:
Joey Hess 2024-06-18 17:02:23 -04:00
parent f18740699e
commit f916ce4b68
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
CmdLine/GitAnnexShell.hs
View file

@ -204,8 +204,12 @@ checkProxy remoteuuid ouruuid = M.lookup ouruuid <$> getProxies >>= \case
-- be used as a proxy. -- be used as a proxy.
proxyfor ps = do proxyfor ps = do
rs <- concat . byCost <$> remoteList rs <- concat . byCost <$> remoteList
myclusters <- annexClusters <$> Annex.getGitConfig
let sameuuid r = uuid r == remoteuuid let sameuuid r = uuid r == remoteuuid
let proxyconfigured = remoteAnnexProxy . R.gitconfig -- Only proxy for a remote when the git configuration
-- allows it.
let proxyconfigured r = remoteAnnexProxy (R.gitconfig r)
|| (any (`M.member` myclusters) $ fromMaybe [] $ remoteAnnexClusterNode $ R.gitconfig r)
let samename r p = name r == proxyRemoteName p let samename r p = name r == proxyRemoteName p
case headMaybe (filter (\r -> sameuuid r && proxyconfigured r && any (samename r) ps) rs) of case headMaybe (filter (\r -> sameuuid r && proxyconfigured r && any (samename r) ps) rs) of
Nothing -> notconfigured Nothing -> notconfigured