diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-05-07 15:56:40 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-05-07 15:56:40 -0400 |
| commit | dccdfc88f82c622a761f371d9140974d44fdc871 (patch) | |
| tree | 7689d1944b199e3a0a965023426d4388092f3f09 | |
| parent | c60ba579661ed502d361eca0e7ce94c8a6544fc7 (diff) | |
Windows: Roll back to an older version of rsync from cygwin. The newer version has some dependency on a newer ssh from cygwin.
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | doc/bugs/rsync_on_windows_broken_by_upgrade.mdwn | 2 | ||||
| -rwxr-xr-x | standalone/windows/build.sh | 9 |
3 files changed, 8 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog index d59e21bcc..e5e7ed13e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -38,6 +38,8 @@ git-annex (5.20150421) UNRELEASED; urgency=medium but a successful fsck can be done read-only) * Windows: Remove cygwin ssh, the newer version of which has stopped honoring the setting of HOME. Instead, copy msysgit's ssh into PATH. + * Windows: Roll back to an older version of rsync from cygwin. + The newer version has some dependency on a newer ssh from cygwin. -- Joey Hess <id@joeyh.name> Tue, 21 Apr 2015 15:54:10 -0400 diff --git a/doc/bugs/rsync_on_windows_broken_by_upgrade.mdwn b/doc/bugs/rsync_on_windows_broken_by_upgrade.mdwn index cb58e009f..929770ccc 100644 --- a/doc/bugs/rsync_on_windows_broken_by_upgrade.mdwn +++ b/doc/bugs/rsync_on_windows_broken_by_upgrade.mdwn @@ -50,7 +50,7 @@ Problem doesn't seem to affect the bundled ssh, just rsync. --[[Joey]] >>> copying it into cmd so it's in PATH. Check: Does this combo work? >>> >>> **This works**! rsync 3.0.9 works ok with msysgit's bundled ssh. ->>> rsync 3.1.1 is the one that needs a newer ssh. +>>> rsync 3.1.1 is the one that needs a newer ssh. **[[done]]** >>> >>> Note that this means we're using an old version of rsync >>> from cygwin with libraries from a newer cygwin. That might prove diff --git a/standalone/windows/build.sh b/standalone/windows/build.sh index ef990004c..0eb06c8ef 100755 --- a/standalone/windows/build.sh +++ b/standalone/windows/build.sh @@ -16,9 +16,6 @@ PATH="/c/Program Files (x86)/NSIS:/c/msysgit/cmd:/c/msysgit/bin:$PATH" withcyg () { PATH="$PATH:/c/cygwin/bin" "$@" } -withcygpreferred () { - PATH="/c/cygwin/bin:$PATH" "$@" -} # This tells git-annex where to upgrade itself from. UPGRADE_LOCATION=http://downloads.kitenet.net/git-annex/windows/current/git-annex-installer.exe @@ -70,7 +67,11 @@ cabal install nsis ghc -fforce-recomp --make Build/NullSoftInstaller.hs # Want to include cygwin programs in bundle, not others, since # it includes the cygwin libs that go with them. -withcygpreferred Build/NullSoftInstaller.exe +# Currently need an older version of rsync than the one from cygwin. +if [ ! -e rsync.exe ]; then + wget https://downloads.kitenet.net/git-annex/windows/assets/rsync.exe +fi +PATH=".:/c/cygwin/bin:$PATH" withcygpreferred Build/NullSoftInstaller.exe rm -f last-incremental-failed |