Avoid passing -p to rsync, to interoperate with crippled filesystems.

In general, git-annex does not try to preserve file permissions. For
example, they don't round trip through special remotes. So it's ok to not
preserve them for git remotes either.

On crippled filesystems, rsync has been observed failing after the file
was transferred because it couldn't set some permission or other.
This commit is contained in:
Joey Hess 2013-02-22 15:23:29 -04:00
parent 4689fbde35
commit a7a1bcd1d6
3 changed files with 2 additions and 3 deletions

View file

@ -427,7 +427,7 @@ rsyncParamsRemote r direction key file afile = do
-- --inplace to resume partial files
rsyncParams :: Remote -> [CommandParam]
rsyncParams r = [Params "-p --progress --inplace"] ++
rsyncParams r = [Params "--progress --inplace"] ++
map Param (remoteAnnexRsyncOptions $ gitconfig r)
commitOnCleanup :: Remote -> Annex a -> Annex a

View file

@ -33,8 +33,6 @@ rsyncServerReceive file = rsync $ rsyncServerParams ++ [File file]
rsyncServerParams :: [CommandParam]
rsyncServerParams =
[ Param "--server"
-- preserve permissions
, Param "-p"
-- preserve timestamps
, Param "-t"
-- allow resuming of transfers of big files

1
debian/changelog vendored
View file

@ -12,6 +12,7 @@ git-annex (3.20130217) UNRELEASED; urgency=low
* Direct mode: Support filesystems like FAT which can change their inodes
each time they are mounted.
* Direct mode: Fix support for adding a modified file.
* Avoid passing -p to rsync, to interoperate with crippled filesystems.
-- Joey Hess <joeyh@debian.org> Sun, 17 Feb 2013 16:42:16 -0400