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

add: display exception when lockdown fails (for RichiH)

Browse source
This commit is contained in:
Joey Hess 2014-03-19 21:08:46 -04:00
parent 060dfe4faa
commit 9aa31b71f3
Failed to extract signature
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Command/Add.hs
View file

@ -93,12 +93,15 @@ start file = ifAnnexed file addpresent add
- Lockdown can fail if a file gets deleted, and Nothing will be returned. - Lockdown can fail if a file gets deleted, and Nothing will be returned.
-} -}
lockDown :: FilePath -> Annex (Maybe KeySource) lockDown :: FilePath -> Annex (Maybe KeySource)
lockDown file = ifM crippledFileSystem lockDown = either (\e -> showErr e >> return Nothing) (return . Just) <=< lockDown'
( liftIO $ catchMaybeIO nohardlink
, do lockDown' :: FilePath -> Annex (Either IOException KeySource)
lockDown' file = ifM crippledFileSystem
( liftIO $ tryIO nohardlink
, tryAnnexIO $ do
tmp <- fromRepo gitAnnexTmpMiscDir tmp <- fromRepo gitAnnexTmpMiscDir
createAnnexDirectory tmp createAnnexDirectory tmp
eitherToMaybe <$> tryAnnexIO (go tmp) go tmp
) )
where where
{- In indirect mode, the write bit is removed from the file as part {- In indirect mode, the write bit is removed from the file as part