summaryrefslogtreecommitdiff
path: root/Command/Add.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-04-30 15:28:17 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-04-30 15:28:17 -0400
commit508920bf728cfb5e4568b68a2943bd33efac26bc (patch)
treed04529a6b2529e771a65ac3c724c33067b9ccb2d /Command/Add.hs
parent4cd5738bb29278498b06b4f4d3edd4962c7a0eea (diff)
Improve behavior when a git-annex command is told to operate on a file that doesn't exist. It will now continue to other files specified after that on the command line, and only error out at the end.
Diffstat (limited to 'Command/Add.hs')
-rw-r--r--Command/Add.hs5
1 files changed, 4 insertions, 1 deletions
diff --git a/Command/Add.hs b/Command/Add.hs
index c461c4d56..d53ba91ad 100644
--- a/Command/Add.hs
+++ b/Command/Add.hs
@@ -116,7 +116,10 @@ start file = ifAnnexed file addpresent add
- Lockdown can fail if a file gets deleted, and Nothing will be returned.
-}
lockDown :: FilePath -> Annex (Maybe KeySource)
-lockDown = either (\e -> showErr e >> return Nothing) (return . Just) <=< lockDown'
+lockDown = either
+ (\e -> warning (show e) >> return Nothing)
+ (return . Just)
+ <=< lockDown'
lockDown' :: FilePath -> Annex (Either IOException KeySource)
lockDown' file = ifM crippledFileSystem