summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Remote/Glacier.hs2
-rw-r--r--debian/changelog1
-rw-r--r--doc/bugs/Glacier_remote_doesn__39__t_pass_the_--region_parameter_to_glacier-cli_on_hasKey.mdwn3
3 files changed, 5 insertions, 1 deletions
diff --git a/Remote/Glacier.hs b/Remote/Glacier.hs
index 33719926c..fe6f53a77 100644
--- a/Remote/Glacier.hs
+++ b/Remote/Glacier.hs
@@ -196,7 +196,7 @@ checkPresent r k = do
else return $ Right False
Left err -> return $ Left err
- params =
+ params = glacierParams (config r)
[ Param "archive"
, Param "checkpresent"
, Param $ getVault $ config r
diff --git a/debian/changelog b/debian/changelog
index 92e121314..f9ebbfd3b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,7 @@ git-annex (5.20140228) UNRELEASED; urgency=medium
* Run .git/hooks/pre-commit-annex whenever a commit is made.
* sync: Automatically resolve merge conflict between and annexed file
and a regular git file.
+ * glacier: Pass --region to glacier checkpresent.
-- Joey Hess <joeyh@debian.org> Fri, 28 Feb 2014 14:52:15 -0400
diff --git a/doc/bugs/Glacier_remote_doesn__39__t_pass_the_--region_parameter_to_glacier-cli_on_hasKey.mdwn b/doc/bugs/Glacier_remote_doesn__39__t_pass_the_--region_parameter_to_glacier-cli_on_hasKey.mdwn
index 1c6b41c3a..7756db866 100644
--- a/doc/bugs/Glacier_remote_doesn__39__t_pass_the_--region_parameter_to_glacier-cli_on_hasKey.mdwn
+++ b/doc/bugs/Glacier_remote_doesn__39__t_pass_the_--region_parameter_to_glacier-cli_on_hasKey.mdwn
@@ -33,3 +33,6 @@ boto.glacier.exceptions.UnexpectedHTTPResponseError: Expected 200, got (404, cod
(user error (glacier ["archive","checkpresent","myvault","--quiet","SHA256E-s1111111--aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.JPG"] exited 1)) failed
git-annex: copy: 1 failed
"""]]
+
+> [[fixed|done]]; made it use the same glacierParams as everything else.
+> --[[Joey]]