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

improve error message

Browse source
This commit is contained in:
Joey Hess 2018-10-16 15:52:40 -04:00
parent b2bafdb2fc
commit bdf6783b92
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Command/Migrate.hs
View file

@ -80,7 +80,7 @@ perform file oldkey oldbackend newbackend = go =<< genkey (fastMigrate oldbacken
forM_ urls $ \url -> forM_ urls $ \url ->
setUrlPresent newkey url setUrlPresent newkey url
next $ Command.ReKey.cleanup file oldkey newkey next $ Command.ReKey.cleanup file oldkey newkey
, error "failed" , giveup "failed creating link from old to new key"
) )
genkey Nothing = return Nothing genkey Nothing = return Nothing
genkey (Just fm) = fm oldkey newbackend afile >>= \case genkey (Just fm) = fm oldkey newbackend afile >>= \case

2
Command/ReKey.hs
View file

@ -68,7 +68,7 @@ perform :: FilePath -> Key -> Key -> CommandPerform
perform file oldkey newkey = do perform file oldkey newkey = do
ifM (inAnnex oldkey) ifM (inAnnex oldkey)
( unlessM (linkKey file oldkey newkey) $ ( unlessM (linkKey file oldkey newkey) $
giveup "failed" giveup "failed creating link from old to new key"
, unlessM (Annex.getState Annex.force) $ , unlessM (Annex.getState Annex.force) $
giveup $ file ++ " is not available (use --force to override)" giveup $ file ++ " is not available (use --force to override)"
) )