diff options
author | Joey Hess <joey@kitenet.net> | 2010-10-19 12:55:40 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2010-10-19 12:55:40 -0400 |
commit | d23fc22f0e17c95765f940f81f733f9580e19107 (patch) | |
tree | c9d4f075f105cc5ca7d9e77338684baafa02fa42 | |
parent | 2ea589e117bcc36ee613454ffb52b8e52cc96bc9 (diff) |
less verbose failures seem better here
-rw-r--r-- | Commands.hs | 6 | ||||
-rw-r--r-- | Core.hs | 7 |
2 files changed, 6 insertions, 7 deletions
diff --git a/Commands.hs b/Commands.hs index 115c3b3ed..e38f9c372 100644 --- a/Commands.hs +++ b/Commands.hs @@ -109,7 +109,7 @@ addCmd file = inBackend file $ do g <- Annex.gitRepo stored <- Backend.storeFileKey file case (stored) of - Nothing -> showEndFail "no backend could store" file + Nothing -> showEndFail Just (key, backend) -> do logStatus key ValuePresent setup g key @@ -162,7 +162,7 @@ getCmd file = notinBackend file $ \(key, backend) -> do logStatus key ValuePresent showEndOk else do - showEndFail "get" file + showEndFail {- Indicates a file's content is not wanted anymore, and should be removed - if it's safe to do so. -} @@ -178,7 +178,7 @@ dropCmd file = notinBackend file $ \(key, backend) -> do then do cleanup key showEndOk - else showEndFail "drop" file + else showEndFail where cleanup key = do logStatus key ValueMissing @@ -104,7 +104,6 @@ showLongNote s = do showEndOk :: Annex () showEndOk = do liftIO $ putStrLn " ok" -showEndFail :: String -> String -> Annex () -showEndFail command file = do - liftIO $ putStrLn "" - liftIO $ hPutStrLn stderr $ command ++ " " ++ file ++ " failed" +showEndFail :: Annex () +showEndFail = do + liftIO $ putStrLn " failed" |