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

Bugfix: Fix hang in webapp when setting up a ssh remote with an absolute path.

Browse source
This commit is contained in:
Joey Hess 2012-11-05 12:35:11 -04:00
parent 0b8027e527
commit 1178840032
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Assistant/MakeRemote.hs
View file

@ -44,7 +44,7 @@ makeSshRemote forcersync sshdata = do
u = maybe (T.pack "") (\v -> T.concat [v, T.pack "@"]) $ sshUserName sshdata u = maybe (T.pack "") (\v -> T.concat [v, T.pack "@"]) $ sshUserName sshdata
h = sshHostName sshdata h = sshHostName sshdata
d d
| T.pack "/" `T.isPrefixOf` sshDirectory sshdata = d | T.pack "/" `T.isPrefixOf` sshDirectory sshdata = sshDirectory sshdata
| otherwise = T.concat [T.pack "/~/", sshDirectory sshdata] | otherwise = T.concat [T.pack "/~/", sshDirectory sshdata]
{- Runs an action that returns a name of the remote, and finishes adding it. -} {- Runs an action that returns a name of the remote, and finishes adding it. -}

2
debian/changelog vendored
View file

@ -43,6 +43,8 @@ git-annex (3.20121018) UNRELEASED; urgency=low
* git-annex-shell: GIT_ANNEX_SHELL_DIRECTORY can be set to limit it * git-annex-shell: GIT_ANNEX_SHELL_DIRECTORY can be set to limit it
to operating on a specified directory. to operating on a specified directory.
* webapp: When setting up authorized_keys, use GIT_ANNEX_SHELL_DIRECTORY. * webapp: When setting up authorized_keys, use GIT_ANNEX_SHELL_DIRECTORY.
* Bugfix: Fix hang in webapp when setting up a ssh remote with an absolute
path.
-- Joey Hess <joeyh@debian.org> Wed, 17 Oct 2012 14:24:10 -0400 -- Joey Hess <joeyh@debian.org> Wed, 17 Oct 2012 14:24:10 -0400