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>
This commit is contained in:
parent
04d211effa
commit
13ec13c85e
2 changed files with 2 additions and 9 deletions
|
@ -237,14 +237,6 @@ Transaction Options (apply to '-S', '-R' and '-U')
|
||||||
|
|
||||||
Upgrade Options (apply to '-S' and '-U')[[UO]]
|
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*::
|
*\--asdeps*::
|
||||||
Install packages non-explicitly; in other words, fake their install reason
|
Install packages non-explicitly; in other words, fake their install reason
|
||||||
to be installed as a dependency. This is useful for makepkg and other
|
to be installed as a dependency. This is useful for makepkg and other
|
||||||
|
|
|
@ -189,7 +189,6 @@ static void usage(int op, const char * const myname)
|
||||||
switch(op) {
|
switch(op) {
|
||||||
case PM_OP_SYNC:
|
case PM_OP_SYNC:
|
||||||
case PM_OP_UPGRADE:
|
case PM_OP_UPGRADE:
|
||||||
addlist(_(" --force force install, overwrite conflicting files\n"));
|
|
||||||
addlist(_(" --overwrite <path>\n"
|
addlist(_(" --overwrite <path>\n"
|
||||||
" overwrite conflicting files (can be used more than once)\n"));
|
" overwrite conflicting files (can be used more than once)\n"));
|
||||||
addlist(_(" --asdeps install packages as non-explicitly installed\n"));
|
addlist(_(" --asdeps install packages as non-explicitly installed\n"));
|
||||||
|
@ -708,6 +707,8 @@ static int parsearg_upgrade(int opt)
|
||||||
}
|
}
|
||||||
switch(opt) {
|
switch(opt) {
|
||||||
case OP_FORCE:
|
case OP_FORCE:
|
||||||
|
pm_printf(ALPM_LOG_WARNING,
|
||||||
|
_("option --force is deprecated; use --overwrite instead\n"));
|
||||||
config->flags |= ALPM_TRANS_FLAG_FORCE;
|
config->flags |= ALPM_TRANS_FLAG_FORCE;
|
||||||
break;
|
break;
|
||||||
case OP_OVERWRITE_FILES:
|
case OP_OVERWRITE_FILES:
|
||||||
|
|
Loading…
Add table
Reference in a new issue