From d603f536bdcad20ef233d03a38f0739d3fed3963 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 21 Aug 2013 18:19:01 -0400 Subject: [PATCH] Set --clobber when running wget to ensure resuming works properly. --- Utility/Url.hs | 2 +- debian/changelog | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Utility/Url.hs b/Utility/Url.hs index 508b9eeb44..2f2ec1dc06 100644 --- a/Utility/Url.hs +++ b/Utility/Url.hs @@ -110,7 +110,7 @@ download' quiet url headers options file = _ -> return False where headerparams = map (\h -> Param $ "--header=" ++ h) headers - wget = go "wget" $ headerparams ++ quietopt "-q" ++ [Params "-c -O"] + wget = go "wget" $ headerparams ++ quietopt "-q" ++ [Params "--clobber -c -O"] {- 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 cc60b973bc..3101a99bd2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ git-annex (4.20130816) UNRELEASED; urgency=low * import: Add options to control handling of duplicate files: --duplicate, --deduplicate, and --clean-duplicates * mirror: New command, makes two repositories contain the same set of files. + * Set --clobber when running wget to ensure resuming works properly. -- Joey Hess Thu, 15 Aug 2013 15:47:52 +0200