less verbose failures seem better here

This commit is contained in:
Joey Hess 2010-10-19 12:55:40 -04:00
parent 2ea589e117
commit d23fc22f0e
2 changed files with 6 additions and 7 deletions

View file

@ -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

View file

@ -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"