diff options
| -rw-r--r-- | Assistant/Ssh.hs | 4 | ||||
| -rw-r--r-- | Command/WebApp.hs | 3 | ||||
| -rw-r--r-- | Remote/WebDAV.hs | 1 | ||||
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | doc/bugs/Box.com_ReposnseTimeout.mdwn | 2 | ||||
| -rw-r--r-- | doc/bugs/amd64_i386_standalone:_no_SKEIN.mdwn | 5 | ||||
| -rw-r--r-- | doc/bugs/box.com_never_stops_syncing..mdwn | 11 | ||||
| -rw-r--r-- | doc/bugs/can__39__t_get.mdwn | 6 | ||||
| -rw-r--r-- | doc/design/roadmap.mdwn | 4 | ||||
| -rw-r--r-- | doc/todo/windows_support.mdwn | 7 |
10 files changed, 41 insertions, 5 deletions
diff --git a/Assistant/Ssh.hs b/Assistant/Ssh.hs index 82da9e33a..acb2fc11c 100644 --- a/Assistant/Ssh.hs +++ b/Assistant/Ssh.hs @@ -143,6 +143,8 @@ addAuthorizedKeys :: Bool -> FilePath -> SshPubKey -> IO Bool addAuthorizedKeys gitannexshellonly dir pubkey = boolSystem "sh" [ Param "-c" , Param $ addAuthorizedKeysCommand gitannexshellonly dir pubkey ] +{- Should only be used within the same process that added the line; + - the layout of the line is not kepy stable across versions. -} removeAuthorizedKeys :: Bool -> FilePath -> SshPubKey -> IO () removeAuthorizedKeys gitannexshellonly dir pubkey = do let keyline = authorizedKeysLine gitannexshellonly dir pubkey @@ -195,7 +197,7 @@ authorizedKeysLine gitannexshellonly dir pubkey - long perl script. -} | otherwise = pubkey where - limitcommand = "command=\"GIT_ANNEX_SHELL_DIRECTORY="++shellEscape dir++" ~/.ssh/git-annex-shell\",no-agent-forwarding,no-port-forwarding,no-X11-forwarding " + limitcommand = "command=\"GIT_ANNEX_SHELL_DIRECTORY="++shellEscape dir++" ~/.ssh/git-annex-shell\",no-agent-forwarding,no-port-forwarding,no-X11-forwarding,no-pty " {- Generates a ssh key pair. -} genSshKeyPair :: IO SshKeyPair diff --git a/Command/WebApp.hs b/Command/WebApp.hs index ee5998c9a..91c9afcd0 100644 --- a/Command/WebApp.hs +++ b/Command/WebApp.hs @@ -163,7 +163,8 @@ firstRun listenhost = do hFlush stdout go | otherwise = do - browser <- maybe Nothing webBrowser <$> Git.Config.global + browser <- maybe Nothing webBrowser + <$> catchDefaultIO Nothing Git.Config.global openBrowser browser htmlshim url Nothing Nothing go where diff --git a/Remote/WebDAV.hs b/Remote/WebDAV.hs index 2cfe2f6d2..91b83053c 100644 --- a/Remote/WebDAV.hs +++ b/Remote/WebDAV.hs @@ -386,6 +386,7 @@ matchStatusCodeException _ _ = Nothing #if MIN_VERSION_DAV(0,6,0) goDAV :: DavUrl -> DavUser -> DavPass -> DAVT IO a -> IO a goDAV url user pass a = choke $ evalDAVT url $ do + setResponseTimeout Nothing -- disable default (5 second!) timeout setCreds user pass a where diff --git a/debian/changelog b/debian/changelog index f9ebbfd3b..cefa45e89 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,6 +25,9 @@ git-annex (5.20140228) UNRELEASED; urgency=medium * sync: Automatically resolve merge conflict between and annexed file and a regular git file. * glacier: Pass --region to glacier checkpresent. + * webdav: When built with a new enough haskell DAV (0.6), disable + the http response timeout, which was only 5 seconds. + * webapp: Include no-pty in ssh authorized_keys lines. -- Joey Hess <joeyh@debian.org> Fri, 28 Feb 2014 14:52:15 -0400 diff --git a/doc/bugs/Box.com_ReposnseTimeout.mdwn b/doc/bugs/Box.com_ReposnseTimeout.mdwn index bb8208b46..4beb6999c 100644 --- a/doc/bugs/Box.com_ReposnseTimeout.mdwn +++ b/doc/bugs/Box.com_ReposnseTimeout.mdwn @@ -8,3 +8,5 @@ I created a new clean repository and configured Box.com (everything from the web git-annex: copy: 1 failed When I got back to the first computer I saw the same behavior, uploading files wasn't working any more. + +> [[duplicate|done]] --[[Joey]] diff --git a/doc/bugs/amd64_i386_standalone:_no_SKEIN.mdwn b/doc/bugs/amd64_i386_standalone:_no_SKEIN.mdwn index 5dd230118..628cb13bd 100644 --- a/doc/bugs/amd64_i386_standalone:_no_SKEIN.mdwn +++ b/doc/bugs/amd64_i386_standalone:_no_SKEIN.mdwn @@ -35,4 +35,7 @@ key/value backends: SHA256E SHA1E SHA512E SHA224E SHA384E SHA256 SHA1 SHA512 SHA remote types: git gcrypt S3 bup directory rsync web webdav glacier hook external """]] --- [[clacke]]
\ No newline at end of file +-- [[clacke]] + +> [[done]] The autobuilds are now running debian unstable, and SKEIN is included +> now. --[[Joey]] diff --git a/doc/bugs/box.com_never_stops_syncing..mdwn b/doc/bugs/box.com_never_stops_syncing..mdwn index 42b2eaf1a..d8e5391b5 100644 --- a/doc/bugs/box.com_never_stops_syncing..mdwn +++ b/doc/bugs/box.com_never_stops_syncing..mdwn @@ -61,3 +61,14 @@ failed """]] More to come(full log) + +> This is [[fixed|done]] in git; when built with a new enough +> version of the haskell DAV library, git-annex disables the default 5 +> second timeout. +> +> It'll still be present in the Debian stable backports, which are +> built with an old version of DAV. Not much I can do about that; +> backporting DAV would be difficult. +> +> The daily builds are updated to use the new version. +> --[[Joey]] diff --git a/doc/bugs/can__39__t_get.mdwn b/doc/bugs/can__39__t_get.mdwn index 42a15e8b6..d5a29a2ae 100644 --- a/doc/bugs/can__39__t_get.mdwn +++ b/doc/bugs/can__39__t_get.mdwn @@ -73,3 +73,9 @@ was git annex unused somewhere before) # End of transcript or log. """]] + +[[!tag moreinfo]] + +> Tagged moreinfo since I have a workable theory about how this happened, +> which would make it user configuration error and not a bug, but +> that has not been confirmed. --[[Joey]] diff --git a/doc/design/roadmap.mdwn b/doc/design/roadmap.mdwn index 0f0df4496..7458468f0 100644 --- a/doc/design/roadmap.mdwn +++ b/doc/design/roadmap.mdwn @@ -9,8 +9,8 @@ Now in the * Month 3 user-driven features and polishing [[!traillink todo/direct_mode_guard]] [[!traillink assistant/upgrading]] * Month 4 [[!traillink assistant/windows text="Windows webapp"]], Linux arm, [[!traillink todo/support_for_writing_external_special_remotes]] * Month 5 user-driven features and polishing -* **Month 6 get Windows out of beta, [[!traillink design/metadata text="metadata and views"]]** -* Month 7 user-driven features and polishing +* Month 6 get Windows out of beta, [[!traillink design/metadata text="metadata and views"]] +* **Month 7 user-driven features and polishing** * Month 8 [[!traillink assistant/telehash]] * Month 9 [[!traillink assistant/gpgkeys]] [[!traillink assistant/sshpassword]] * Month 10 get [[assistant/Android]] out of beta diff --git a/doc/todo/windows_support.mdwn b/doc/todo/windows_support.mdwn index bf06f54c2..17accd62e 100644 --- a/doc/todo/windows_support.mdwn +++ b/doc/todo/windows_support.mdwn @@ -40,6 +40,13 @@ now! --[[Joey]] has to connect twice to the remote system over ssh per file, which is much slower than on systems supporting connection caching. * glacier-cli is not easily available (probably) +* user feedback: "Git on windows installer provides openssh 4.6. git-annex installer + provides openssh 6.2 . This seems to create problems regarding how + `known_hosts` file path is setup. Setting `GIT_SSH=` to the git-annex + openssh version fixes the problem." + However, I don't know how to determine what that location is after + it's been installed. Maybe look for ssh.exe in same directory as + git-annex.exe? --[[Joey]] ## stuff needing testing |