diff options
| -rw-r--r-- | Utility/Url.hs | 10 | ||||
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | doc/bugs/wget_and_android_4.4.mdwn | 2 |
3 files changed, 12 insertions, 1 deletions
diff --git a/Utility/Url.hs b/Utility/Url.hs index 03c311fd2..2cbab77c8 100644 --- a/Utility/Url.hs +++ b/Utility/Url.hs @@ -125,7 +125,15 @@ download' quiet url headers options file ua = _ -> return False where headerparams = map (\h -> Param $ "--header=" ++ h) headers - wget = go "wget" $ headerparams ++ quietopt "-q" ++ [Params "--clobber -c -O"] + wget = go "wget" $ headerparams ++ quietopt "-q" ++ wgetparams + {- Regular wget needs --clobber to continue downloading an existing + - file. On Android, busybox wget is used, which does not + - support, or need that option. -} +#ifndef __ANDROID__ + wgetparams = [Params "--clobber -c -O"] +#else + wgetparams = [Params "-c -O"] +#endif {- Uses the -# progress display, because the normal - one is very confusing when resuming, showing - the remainder to download as the whole file, diff --git a/debian/changelog b/debian/changelog index f4a2e4f9e..c9edeef4c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ git-annex (5.20140108) UNRELEASED; urgency=medium * Added tahoe special remote. * external special remote protocol: Added GETGITDIR, and GETAVAILABILITY. + * Android: Avoid passing --clobber to busybox wget. -- Joey Hess <joeyh@debian.org> Wed, 08 Jan 2014 13:13:54 -0400 diff --git a/doc/bugs/wget_and_android_4.4.mdwn b/doc/bugs/wget_and_android_4.4.mdwn index eb67a6235..a695bc978 100644 --- a/doc/bugs/wget_and_android_4.4.mdwn +++ b/doc/bugs/wget_and_android_4.4.mdwn @@ -23,3 +23,5 @@ android is version 5.20131230-g4aa88d8 for android 4.3+ # End of transcript or log. """]] + +> [[fixed|done]] --[[Joey]] |