diff options
| -rw-r--r-- | Annex/Ssh.hs | 27 | ||||
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/copyright | 2 | ||||
| -rw-r--r-- | standalone/android/icons/drawable-hdpi/ic_launcher.png | bin | 1991 -> 2612 bytes | |||
| -rw-r--r-- | standalone/android/icons/drawable-hdpi/ic_stat_service_notification_icon.png | bin | 1071 -> 1310 bytes | |||
| -rw-r--r-- | standalone/android/icons/drawable-ldpi/ic_launcher.png | bin | 1031 -> 1279 bytes | |||
| -rw-r--r-- | standalone/android/icons/drawable-ldpi/ic_stat_service_notification_icon.png | bin | 587 -> 682 bytes | |||
| -rw-r--r-- | standalone/android/icons/drawable-mdpi/ic_launcher.png | bin | 1389 -> 1768 bytes | |||
| -rw-r--r-- | standalone/android/icons/drawable-mdpi/ic_stat_service_notification_icon.png | bin | 712 -> 946 bytes | |||
| -rw-r--r-- | standalone/android/icons/drawable-xhdpi/ic_launcher.png | bin | 2671 -> 3396 bytes | |||
| -rw-r--r-- | standalone/android/icons/drawable-xhdpi/ic_stat_service_notification_icon.png | bin | 1379 -> 1837 bytes |
11 files changed, 14 insertions, 21 deletions
diff --git a/Annex/Ssh.hs b/Annex/Ssh.hs index 940cbb5a7..397fdb75c 100644 --- a/Annex/Ssh.hs +++ b/Annex/Ssh.hs @@ -51,17 +51,18 @@ sshInfo (host, port) = go =<< sshCacheDir go (Just dir) = do let socketfile = dir </> hostport2socket host port if valid_unix_socket_path socketfile - then return (Just socketfile, cacheparams socketfile) + then return (Just socketfile, sshConnectionCachingParams socketfile) else do socketfile' <- liftIO $ relPathCwdToFile socketfile if valid_unix_socket_path socketfile' - then return (Just socketfile', cacheparams socketfile') + then return (Just socketfile', sshConnectionCachingParams socketfile') else return (Nothing, []) - cacheparams :: FilePath -> [CommandParam] - cacheparams socketfile = - [ Param "-S", Param socketfile - , Params "-o ControlMaster=auto -o ControlPersist=yes" - ] + +sshConnectionCachingParams :: FilePath -> [CommandParam] +sshConnectionCachingParams socketfile = + [ Param "-S", Param socketfile + , Params "-o ControlMaster=auto -o ControlPersist=yes" + ] {- ssh connection caching creates sockets, so will not work on a - crippled filesystem. A GIT_ANNEX_TMP_DIR can be provided to use @@ -116,14 +117,13 @@ sshCleanup = go =<< sshCacheDir stopssh socketfile #endif stopssh socketfile = do - let (host, port) = socket2hostport socketfile - (_, params) <- sshInfo (host, port) + let params = sshConnectionCachingParams socketfile -- "ssh -O stop" is noisy on stderr even with -q void $ liftIO $ catchMaybeIO $ withQuietOutput createProcessSuccess $ proc "ssh" $ toCommand $ [ Params "-O stop" - ] ++ params ++ [Param host] + ] ++ params ++ [Param "any"] -- Cannot remove the lock file; other processes may -- be waiting on our exclusive lock to use it. @@ -131,13 +131,6 @@ hostport2socket :: String -> Maybe Integer -> FilePath hostport2socket host Nothing = host hostport2socket host (Just port) = host ++ "!" ++ show port -socket2hostport :: FilePath -> (String, Maybe Integer) -socket2hostport socket - | null p = (h, Nothing) - | otherwise = (h, readish p) - where - (h, p) = separate (== '!') $ takeFileName socket - socket2lock :: FilePath -> FilePath socket2lock socket = socket ++ lockExt diff --git a/debian/changelog b/debian/changelog index d78f1a599..3d025c866 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,8 @@ git-annex (4.20130710) UNRELEASED; urgency=low + * Fix data loss bug when adding an (uncompressed) tarball of a + git-annex repository, or other file that begins with something + that can be mistaken for a git-annex link. Closes: #717456 * Install XDG desktop icon files. * webapp: Better display of added files. * fix: Preserve the original mtime of fixed symlinks. @@ -25,9 +28,6 @@ git-annex (4.20130710) UNRELEASED; urgency=low * webapp: Differentiate between creating a new S3/Glacier/WebDav remote, and initializing an existing remote. When creating a new remote, avoid conflicts with other existing (or deleted) remotes with the same name. - * Bug fix: Adding files that contained a tarball of a git-annex repository, - or other content in the first line that looks like a git-annex link, - could cause git-annex add to malfunction and lose the file content. * When an XMPP server has SRV records, try them, but don't then fall back to the regular host if they all fail. diff --git a/debian/copyright b/debian/copyright index c2742e5ce..5a667adf7 100644 --- a/debian/copyright +++ b/debian/copyright @@ -18,7 +18,7 @@ Files: Utility/Gpg/Types.hs Copyright: 2013 guilhem <guilhem@fripost.org> License: GPL-3+ -Files: doc/logo* */favicon.ico standalone/osx/git-annex.app/Contents/Resources/git-annex.icns +Files: doc/logo* */favicon.ico standalone/osx/git-annex.app/Contents/Resources/git-annex.icns standalone/android/icons/* Copyright: 2007 Henrik Nyh <http://henrik.nyh.se/> 2010 Joey Hess <joey@kitenet.net> 2013 John Lawrence diff --git a/standalone/android/icons/drawable-hdpi/ic_launcher.png b/standalone/android/icons/drawable-hdpi/ic_launcher.png Binary files differindex 2d377083f..6170d723c 100644 --- a/standalone/android/icons/drawable-hdpi/ic_launcher.png +++ b/standalone/android/icons/drawable-hdpi/ic_launcher.png diff --git a/standalone/android/icons/drawable-hdpi/ic_stat_service_notification_icon.png b/standalone/android/icons/drawable-hdpi/ic_stat_service_notification_icon.png Binary files differindex 92a445249..f30483b38 100644 --- a/standalone/android/icons/drawable-hdpi/ic_stat_service_notification_icon.png +++ b/standalone/android/icons/drawable-hdpi/ic_stat_service_notification_icon.png diff --git a/standalone/android/icons/drawable-ldpi/ic_launcher.png b/standalone/android/icons/drawable-ldpi/ic_launcher.png Binary files differindex d0b3e976c..0c5d55ab6 100644 --- a/standalone/android/icons/drawable-ldpi/ic_launcher.png +++ b/standalone/android/icons/drawable-ldpi/ic_launcher.png diff --git a/standalone/android/icons/drawable-ldpi/ic_stat_service_notification_icon.png b/standalone/android/icons/drawable-ldpi/ic_stat_service_notification_icon.png Binary files differindex 1c82d8e56..0e0b33e95 100644 --- a/standalone/android/icons/drawable-ldpi/ic_stat_service_notification_icon.png +++ b/standalone/android/icons/drawable-ldpi/ic_stat_service_notification_icon.png diff --git a/standalone/android/icons/drawable-mdpi/ic_launcher.png b/standalone/android/icons/drawable-mdpi/ic_launcher.png Binary files differindex 58b8d4453..46302b21a 100644 --- a/standalone/android/icons/drawable-mdpi/ic_launcher.png +++ b/standalone/android/icons/drawable-mdpi/ic_launcher.png diff --git a/standalone/android/icons/drawable-mdpi/ic_stat_service_notification_icon.png b/standalone/android/icons/drawable-mdpi/ic_stat_service_notification_icon.png Binary files differindex 4e6a43168..7febe040d 100644 --- a/standalone/android/icons/drawable-mdpi/ic_stat_service_notification_icon.png +++ b/standalone/android/icons/drawable-mdpi/ic_stat_service_notification_icon.png diff --git a/standalone/android/icons/drawable-xhdpi/ic_launcher.png b/standalone/android/icons/drawable-xhdpi/ic_launcher.png Binary files differindex 98949c920..601b787cb 100644 --- a/standalone/android/icons/drawable-xhdpi/ic_launcher.png +++ b/standalone/android/icons/drawable-xhdpi/ic_launcher.png diff --git a/standalone/android/icons/drawable-xhdpi/ic_stat_service_notification_icon.png b/standalone/android/icons/drawable-xhdpi/ic_stat_service_notification_icon.png Binary files differindex 08d63dfd6..253e90eb8 100644 --- a/standalone/android/icons/drawable-xhdpi/ic_stat_service_notification_icon.png +++ b/standalone/android/icons/drawable-xhdpi/ic_stat_service_notification_icon.png |
