mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

glacier: Fix pipe setup when calling glacier-cli to retrieve an object.

Browse source
This commit is contained in:
Joey Hess 2014-10-20 15:11:01 -04:00
parent f23598fe48
commit fced322834
4 changed files with 28 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Remote/Glacier.hs
View file

@ -141,7 +141,10 @@ retrieve r k sink = go =<< glacierEnv c u
] ]
go Nothing = error "cannot retrieve from glacier" go Nothing = error "cannot retrieve from glacier"
go (Just e) = do go (Just e) = do
let cmd = (proc "glacier" (toCommand params)) { env = Just e } let cmd = (proc "glacier" (toCommand params))
{ env = Just e
, std_out = CreatePipe
}
(_, Just h, _, pid) <- liftIO $ createProcess cmd (_, Just h, _, pid) <- liftIO $ createProcess cmd
-- Glacier cannot store empty files, so if the output is -- Glacier cannot store empty files, so if the output is
-- empty, the content is not available yet. -- empty, the content is not available yet.

1
debian/changelog vendored
View file

@ -10,6 +10,7 @@ git-annex (5.20141014) UNRELEASED; urgency=medium
for inability to manipulate the environment on windows. This includes for inability to manipulate the environment on windows. This includes
making git-annex not re-exec itself on start on windows, and making the making git-annex not re-exec itself on start on windows, and making the
test suite on Windows run tests without forking. test suite on Windows run tests without forking.
* glacier: Fix pipe setup when calling glacier-cli to retrieve an object.
-- Joey Hess <joeyh@debian.org> Tue, 14 Oct 2014 14:09:24 -0400 -- Joey Hess <joeyh@debian.org> Tue, 14 Oct 2014 14:09:24 -0400

14
doc/bugs/get_from_glacier_fails_too_early/comment_1_5a4e37fef629e07dce6b83ae311d1b03._comment Normal file
View file

@ -0,0 +1,14 @@
[[!comment format=mdwn
username="joey"
subject="""comment 1"""
date="2014-10-20T18:54:43Z"
content="""
Wow, the code seems to neglect to actually set up a pipe from glacier-cli's
stdout. It seems this broke quite a while ago, in
[[!commit fb19d56476bb6eb5aa4d794a10199adb267d5870]] and nobody noticed.
I have committed what should be a fix, but it's pretty hard for me to test
this. Can you please either test the current daily autobuild for linux
amd64 (should be ready about 15 minutes after I post this comment), or
build git-annex from master and test?
"""]]

9
doc/bugs/get_from_glacier_fails_too_early/comment_2_da065d367d0a3c91e4957f588f36dc67._comment Normal file
View file

@ -0,0 +1,9 @@
[[!comment format=mdwn
username="joey"
subject="""creds"""
date="2014-10-20T19:09:28Z"
content="""
Since you are using gpg encryption, your repository may have
[[upgrades/insecure_embedded_creds]]. Strongly suggest you check if it
does.
"""]]