summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Utility/Url.hs2
-rw-r--r--debian/changelog1
2 files changed, 2 insertions, 1 deletions
diff --git a/Utility/Url.hs b/Utility/Url.hs
index 508b9eeb4..2f2ec1dc0 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 cc60b973b..3101a99bd 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 <joeyh@debian.org> Thu, 15 Aug 2013 15:47:52 +0200