diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-04-10 12:54:58 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-04-10 12:54:58 -0400 |
| commit | 9646083316973e935b177aa7c44c220d427e34ce (patch) | |
| tree | 26ea77322739edc78d6e0b4b1b3d79590e06880f | |
| parent | 18443744061807d7c4cc5692aeadd2e0f94b5706 (diff) | |
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.
| -rw-r--r-- | Build/BundledPrograms.hs | 5 | ||||
| -rw-r--r-- | debian/changelog | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/Build/BundledPrograms.hs b/Build/BundledPrograms.hs index d1f8cfd4a..dd78994b0 100644 --- a/Build/BundledPrograms.hs +++ b/Build/BundledPrograms.hs @@ -45,7 +45,12 @@ bundledPrograms = catMaybes #endif , SysConfig.gpg , 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" +#endif , ifset SysConfig.bup "bup" , SysConfig.lsof , SysConfig.gcrypt diff --git a/debian/changelog b/debian/changelog index 996f0ef04..f5cfb995e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,9 @@ git-annex (5.20140406) UNRELEASED; urgency=medium * importfeed: Filename template can now contain an itempubdate variable. 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 |