summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Commands.hs12
1 files changed, 9 insertions, 3 deletions
diff --git a/Commands.hs b/Commands.hs
index a16470fe3..6c519c294 100644
--- a/Commands.hs
+++ b/Commands.hs
@@ -144,7 +144,10 @@ wantCmd file = do error "not implemented" -- TODO
{- Indicates a file is not wanted. -}
dropCmd :: FilePath -> Annex ()
dropCmd file = notinBackend file err $ \(key, backend) -> do
- requireEnoughCopies key
+ force <- Annex.flagIsSet Force
+ if (not force)
+ then requireEnoughCopies key
+ else return ()
success <- Backend.removeKey backend key
if (success)
then do
@@ -220,6 +223,9 @@ requireEnoughCopies key = do
++ unsafe
listbad bad = "\nI was unable to access these remotes: " ++
(Remotes.list bad)
- unsafe = "\n -- According to the " ++ config ++
- " setting, it is not safe to remove it!"
+ unsafe = "\n" ++
+ " -- According to the " ++ config ++
+ " setting, it is not safe to remove it!\n" ++
+ " (Use --force to override.)"
+
config = "annex.numcopies"