deprecate --force in favor of --overwrite

--force is widely misunderstood and the same effect can now be achieved
with --overwrite, which is better named and can be used more safely.

Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>

2 files changed, 2 insertions, 9 deletions

diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt
index 2586c1fe..f01f4aa4 100644
--- a/doc/pacman.8.txt
+++ b/doc/pacman.8.txt
@@ -237,14 +237,6 @@ Transaction Options (apply to '-S', '-R' and '-U')
 
 Upgrade Options (apply to '-S' and '-U')[[UO]]
 ----------------------------------------------
-*\--force*::
-	Bypass file conflict checks and overwrite conflicting files. If the
-	package that is about to be installed contains files that are already
-	installed, this option will cause all those files to be overwritten.
-	Using '\--force' will not allow overwriting a directory with a file or
-	installing packages with conflicting files and directories.
-	This option should be used with care, ideally not at all.
-
 *\--asdeps*::
 	Install packages non-explicitly; in other words, fake their install reason
 	to be installed as a dependency. This is useful for makepkg and other
diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c
index e0e7d01d..9d1cf6bb 100644
--- a/src/pacman/pacman.c
+++ b/src/pacman/pacman.c
@@ -189,7 +189,6 @@ static void usage(int op, const char * const myname)
 		switch(op) {
 			case PM_OP_SYNC:
 			case PM_OP_UPGRADE:
-				addlist(_("      --force          force install, overwrite conflicting files\n"));
 				addlist(_("      --overwrite <path>\n"
 				          "                       overwrite conflicting files (can be used more than once)\n"));
 				addlist(_("      --asdeps         install packages as non-explicitly installed\n"));
@@ -708,6 +707,8 @@ static int parsearg_upgrade(int opt)
 	}
 	switch(opt) {
 		case OP_FORCE:
+			pm_printf(ALPM_LOG_WARNING,
+					_("option --force is deprecated; use --overwrite instead\n"));
 			config->flags |= ALPM_TRANS_FLAG_FORCE;
 			break;
 		case OP_OVERWRITE_FILES: