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

Remove wget from OSX dmg, due to issues with cert paths that broke git-annex automatic upgrading. Instead, curl is used, unless the OSX system has wget installed, which will then be used.

Browse source
This commit is contained in:
Joey Hess 2014-04-10 12:54:58 -04:00
parent fdd189626e
commit 407d60ca5d
2 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Build/BundledPrograms.hs
View file

@ -45,7 +45,12 @@ bundledPrograms = catMaybes
#endif #endif
, SysConfig.gpg , SysConfig.gpg
, ifset SysConfig.curl "curl" , ifset SysConfig.curl "curl"
#ifndef darwin_HOST_OS
-- wget on OSX has been problimatic, looking for certs in the wrong
-- places. Don't ship it, use curl or the OSX's own wget if it has
-- one.
, ifset SysConfig.wget "wget" , ifset SysConfig.wget "wget"
#endif
, ifset SysConfig.bup "bup" , ifset SysConfig.bup "bup"
, SysConfig.lsof , SysConfig.lsof
, SysConfig.gcrypt , SysConfig.gcrypt

3
debian/changelog vendored
View file

@ -2,6 +2,9 @@ git-annex (5.20140406) UNRELEASED; urgency=medium
* importfeed: Filename template can now contain an itempubdate variable. * importfeed: Filename template can now contain an itempubdate variable.
Needs feed 0.3.9.2. Needs feed 0.3.9.2.
* Remove wget from OSX dmg, due to issues with cert paths that broke
git-annex automatic upgrading. Instead, curl is used, unless the
OSX system has wget installed, which will then be used.
-- Joey Hess <joeyh@debian.org> Mon, 07 Apr 2014 16:22:02 -0400 -- Joey Hess <joeyh@debian.org> Mon, 07 Apr 2014 16:22:02 -0400