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

make storeExport throw exceptions

Browse source
This commit is contained in:
Joey Hess 2020-05-15 12:17:15 -04:00
parent dc7dc1e179
commit 4814b444dd
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
11 changed files with 99 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Command/Export.hs
View file

@ -20,6 +20,7 @@ import qualified Git.Ref
import Git.Types
import Git.FilePath
import Git.Sha
import qualified Remote
import Types.Remote
import Types.Export
import Annex.Export
@ -280,7 +281,8 @@ performExport r db ek af contentsha loc allfilledvar = do
let rollback = void $
performUnexport r db [ek] loc
sendAnnex k rollback $ \f ->
storer f k loc pm
Remote.action $
storer f k loc pm
, do
showNote "not available"
return False
@ -291,7 +293,8 @@ performExport r db ek af contentsha loc allfilledvar = do
b <- catObject contentsha
liftIO $ L.hPut h b
liftIO $ hClose h
storer tmp sha1k loc nullMeterUpdate
Remote.action $
storer tmp sha1k loc nullMeterUpdate
let failedsend = liftIO $ modifyMVar_ allfilledvar (pure . const (AllFilled False))
case sent of
Right True -> next $ cleanupExport r db ek loc True