mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Windows: Roll back to an older version of rsync from cygwin. The newer version has some dependency on a newer ssh from cygwin.

Browse source
This commit is contained in:
Joey Hess 2015-05-07 15:56:40 -04:00
parent ce285ea6fa
commit 18fc05ff04
3 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
debian/changelog vendored
View file

@ -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

2
doc/bugs/rsync_on_windows_broken_by_upgrade.mdwn
View file

@ -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

9
standalone/windows/build.sh
View file

@ -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