--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 <[email protected]> --- doc/pacman.8.txt | 8 -------- src/pacman/pacman.c | 3 ++- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index 19b959b1..dc5d3ba2 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -233,14 +233,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 2e31fcfc..8198af09 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")); @@ -703,6 +702,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: -- 2.12.1
