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

everything is building again

Browse source 
However, the test suite fails some quickchecks, so this branch is not
yet in a mergeable state.
This commit is contained in:
Joey Hess 2019-12-05 15:10:23 -04:00
parent c20f4704a7
commit 3266ad3ff7
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
14 changed files with 51 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Assistant/WebApp/Configurators/Ssh.hs
View file

@ -20,7 +20,7 @@ import Types.StandardGroups
import Utility.UserInfo
import Utility.Gpg
import Types.Remote (RemoteConfig)
import Git.Types (RemoteName, fromRef)
import Git.Types (RemoteName, fromRef, fromConfigKey)
import qualified Remote.GCrypt as GCrypt
import qualified Annex
import qualified Git.Command
@ -317,7 +317,8 @@ testServer sshinput@(SshInput { inputHostname = Just hn }) = do
else T.pack $ "Failed to ssh to the server. Transcript: " ++ s
finduuid (k, v)
| k == "annex.uuid" = Just $ toUUID v
| k == GCrypt.coreGCryptId = Just $ genUUIDInNameSpace gCryptNameSpace v
| k == fromConfigKey GCrypt.coreGCryptId =
Just $ genUUIDInNameSpace gCryptNameSpace v
| otherwise = Nothing
checkcommand c = "if which " ++ c ++ "; then " ++ report c ++ "; fi"