Android: Avoid passing --clobber to busybox wget.

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,

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
 

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