diff options
author | 2012-11-05 12:35:11 -0400 | |
---|---|---|
committer | 2012-11-05 12:35:11 -0400 | |
commit | 0a31669c2c3d6932253b51f2e1470a08a30bb314 (patch) | |
tree | 13f1d8764321815c06071a8cea5850ca1099c686 | |
parent | 727e0ec0e1d2a2057fde863fa8bdee1ac9995502 (diff) |
Bugfix: Fix hang in webapp when setting up a ssh remote with an absolute path.
-rw-r--r-- | Assistant/MakeRemote.hs | 2 | ||||
-rw-r--r-- | debian/changelog | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Assistant/MakeRemote.hs b/Assistant/MakeRemote.hs index 0cd3369be..479ebd3ff 100644 --- a/Assistant/MakeRemote.hs +++ b/Assistant/MakeRemote.hs @@ -44,7 +44,7 @@ makeSshRemote forcersync sshdata = do u = maybe (T.pack "") (\v -> T.concat [v, T.pack "@"]) $ sshUserName sshdata h = sshHostName sshdata d - | T.pack "/" `T.isPrefixOf` sshDirectory sshdata = d + | T.pack "/" `T.isPrefixOf` sshDirectory sshdata = sshDirectory sshdata | otherwise = T.concat [T.pack "/~/", sshDirectory sshdata] {- Runs an action that returns a name of the remote, and finishes adding it. -} diff --git a/debian/changelog b/debian/changelog index a751acea0..08b6b09f8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -43,6 +43,8 @@ git-annex (3.20121018) UNRELEASED; urgency=low * git-annex-shell: GIT_ANNEX_SHELL_DIRECTORY can be set to limit it to operating on a specified 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 |