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

also avoid crashing in most circumstances if unable to determine the username

Browse source 
Mostly the username is only used for the git committer or other display
purposes, and we can just fall back to a dummy value in these cases.

The only remaining place where an error is thrown is when starting local
pairing, which needs the username to be known.
This commit is contained in:
Joey Hess 2016-06-08 15:04:15 -04:00
parent a3ff99ea3b
commit 8e4cbefbc6
Failed to extract signature
6 changed files with 20 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -156,10 +156,10 @@ getAddSshR :: Handler Html
getAddSshR = postAddSshR
postAddSshR :: Handler Html
postAddSshR = sshConfigurator $ do
username <- liftIO $ T.pack <$> myUserName
username <- liftIO $ either (const Nothing) (Just . T.pack) <$> myUserName
((result, form), enctype) <- liftH $
runFormPostNoToken $ renderBootstrap3 bootstrapFormLayout $ sshInputAForm textField $
SshInput Nothing (Just username) Password Nothing Nothing 22
SshInput Nothing username Password Nothing Nothing 22
case result of
FormSuccess sshinput -> do
s <- liftAssistant $ testServer sshinput