summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-06-14 20:20:03 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-06-14 20:20:03 -0400
commitca9d94a0add47446eca1ab2474faccc48a0cadf2 (patch)
tree6562c1b8753e85a86e72f8e06c38c7fb1d1ab184
parent06caf52f03de118e08dbe368d431835b5a8e6bd6 (diff)
addurl: Was broken by a typo introduced 2 released ago, now fixed. Closes: #677576
-rw-r--r--Command/AddUrl.hs2
-rw-r--r--debian/changelog2
2 files changed, 3 insertions, 1 deletions
diff --git a/Command/AddUrl.hs b/Command/AddUrl.hs
index 87b24149d..369940bdf 100644
--- a/Command/AddUrl.hs
+++ b/Command/AddUrl.hs
@@ -73,7 +73,7 @@ download url file = do
liftIO $ createDirectoryIfMissing True (parentDir tmp)
stopUnless (downloadUrl [url] tmp) $ do
backend <- chooseBackend file
- let source = KeySource { keyFilename = file, contentLocation = file}
+ let source = KeySource { keyFilename = file, contentLocation = tmp }
k <- genKey source backend
case k of
Nothing -> stop
diff --git a/debian/changelog b/debian/changelog
index 67ecdda45..624f1e132 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
git-annex (3.20120612) UNRELEASED; urgency=low
+ * addurl: Was broken by a typo introduced 2 released ago, now fixed.
+ Closes: #677576
* Install man page when run by cabal, in a location where man will
find it, even when installing under $HOME. Thanks, Nathan Collins