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

improve message

Browse source 
Pluralize copies appropriately.

This commit was sponsored by Mark Reidenbach on Patreon.
This commit is contained in:
Joey Hess 2021-04-27 13:39:56 -04:00
parent a166d2520b
commit 4edde98709
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Annex/NumCopies.hs
View file

@ -241,9 +241,11 @@ notEnoughCopies key neednum needmin have skip bad nolocmsg lockunsupported = do
then showLongNote $ then showLongNote $
"Could only verify the existence of " ++ "Could only verify the existence of " ++
show (length have) ++ " out of " ++ show (fromNumCopies neednum) ++ show (length have) ++ " out of " ++ show (fromNumCopies neednum) ++
" necessary copies" " necessary " ++ pluralcopies (fromNumCopies neednum)
else do else do
showLongNote $ "Unable to lock down " ++ show (fromMinCopies needmin) ++ " copy of file that is required to safely drop it." showLongNote $ "Unable to lock down " ++ show (fromMinCopies needmin) ++
" " ++ pluralcopies (fromMinCopies needmin) ++
" of file necessary to safely drop it."
if null lockunsupported if null lockunsupported
then showLongNote "(This could have happened because of a concurrent drop, or because a remote has too old a version of git-annex-shell installed.)" then showLongNote "(This could have happened because of a concurrent drop, or because a remote has too old a version of git-annex-shell installed.)"
else showLongNote $ "These remotes do not support locking: " else showLongNote $ "These remotes do not support locking: "
@ -251,6 +253,9 @@ notEnoughCopies key neednum needmin have skip bad nolocmsg lockunsupported = do
Remote.showTriedRemotes bad Remote.showTriedRemotes bad
Remote.showLocations True key (map toUUID have++skip) nolocmsg Remote.showLocations True key (map toUUID have++skip) nolocmsg
where
pluralcopies 1 = "copy"
pluralcopies _ = "copies"
{- Finds locations of a key that can be used to get VerifiedCopies, {- Finds locations of a key that can be used to get VerifiedCopies,
- in order to allow dropping the key. - in order to allow dropping the key.