diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-08-07 13:27:50 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-08-07 13:30:08 -0400 |
| commit | 2a9077f4e92b588200eafcda4d485e95998917a2 (patch) | |
| tree | b9dd7746fd647398dfebd1ddc353b4a5367106e6 /Command/Get.hs | |
| parent | 96d0a36f8589ef1ee4f23adaae7ea512adb7a617 (diff) | |
fix transfer log cleanup crash
Avoid crashing when "git annex get" fails to download from one location,
and falls back to downloading from a second location.
The problem is that git annex get calls download recursively from within
itself if the first download attempt fails. So the first time through, it
writes a transfer info file, which is then overwritten on the second,
recursive call. Then on cleanup, it tries to delete the file twice, which
of course doesn't work.
Fixed both by not crashing if the transfer file is removed, and by
changing Get to not run download recursively like that. It's the only
thing that did so, and it just seems like a bad idea.
Diffstat (limited to 'Command/Get.hs')
| -rw-r--r-- | Command/Get.hs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Command/Get.hs b/Command/Get.hs index 95a7040bb..18153ce88 100644 --- a/Command/Get.hs +++ b/Command/Get.hs @@ -65,7 +65,8 @@ getKeyFile key file dest = dispatch =<< Remote.keyPossibilities key | Remote.hasKeyCheap r = either (const False) id <$> Remote.hasKey r key | otherwise = return True - docopy r continue = download (Remote.uuid r) key (Just file) $ do - showAction $ "from " ++ Remote.name r - ifM (Remote.retrieveKeyFile r key (Just file) dest) - ( return True , continue) + docopy r continue = do + ok <- download (Remote.uuid r) key (Just file) $ do + showAction $ "from " ++ Remote.name r + Remote.retrieveKeyFile r key (Just file) dest + if ok then return ok else continue |