show a message to tell why adding a file failed
This commit is contained in:
parent
f77be9d0d8
commit
68f38a7ae6
1 changed files with 5 additions and 4 deletions
|
@ -122,7 +122,7 @@ ingest (Just source) = do
|
||||||
case (cache, inodeCache source) of
|
case (cache, inodeCache source) of
|
||||||
(_, Nothing) -> go k cache
|
(_, Nothing) -> go k cache
|
||||||
(Just newc, Just c) | compareStrong c newc -> go k cache
|
(Just newc, Just c) | compareStrong c newc -> go k cache
|
||||||
_ -> failure
|
_ -> failure "changed while it was being added"
|
||||||
where
|
where
|
||||||
go k cache = ifM isDirect ( godirect k cache , goindirect k cache )
|
go k cache = ifM isDirect ( godirect k cache , goindirect k cache )
|
||||||
|
|
||||||
|
@ -131,15 +131,16 @@ ingest (Just source) = do
|
||||||
moveAnnex key $ contentLocation source
|
moveAnnex key $ contentLocation source
|
||||||
liftIO $ nukeFile $ keyFilename source
|
liftIO $ nukeFile $ keyFilename source
|
||||||
return $ Just key
|
return $ Just key
|
||||||
goindirect Nothing _ = failure
|
goindirect Nothing _ = failure "failed to generate a key"
|
||||||
|
|
||||||
godirect (Just (key, _)) (Just cache) = do
|
godirect (Just (key, _)) (Just cache) = do
|
||||||
addInodeCache key cache
|
addInodeCache key cache
|
||||||
finishIngestDirect key source
|
finishIngestDirect key source
|
||||||
return $ Just key
|
return $ Just key
|
||||||
godirect _ _ = failure
|
godirect _ _ = failure "failed to generate a key"
|
||||||
|
|
||||||
failure = do
|
failure msg = do
|
||||||
|
warning $ keyFilename source ++ " " ++ msg
|
||||||
when (contentLocation source /= keyFilename source) $
|
when (contentLocation source /= keyFilename source) $
|
||||||
liftIO $ nukeFile $ contentLocation source
|
liftIO $ nukeFile $ contentLocation source
|
||||||
return Nothing
|
return Nothing
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue