Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAllan McRae <allan@archlinux.org>2018-05-29 13:57:13 +1000
committerAllan McRae <allan@archlinux.org>2018-08-10 12:38:03 +1000
commit7d05ffceaf9161a6572505d25b5017e1eb33bf0e (patch)
tree574de92ad35e6f1b65005327372b1a2a825f3e62 /src
parente4be26b7327d8378735205ebedfc9718fb6fbba1 (diff)
Remove the last traces of the pacman --force option
Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'src')
-rw-r--r--src/pacman/pacman.c5
-rw-r--r--src/pacman/sync.c3
2 files changed, 0 insertions, 8 deletions
diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c
index e0178da8..a2a420b6 100644
--- a/src/pacman/pacman.c
+++ b/src/pacman/pacman.c
@@ -716,11 +716,6 @@ static int parsearg_upgrade(int opt)
return 0;
}
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:
parsearg_util_addlist(&(config->overwrite_files));
break;
diff --git a/src/pacman/sync.c b/src/pacman/sync.c
index 3c6be89d..ef8faedf 100644
--- a/src/pacman/sync.c
+++ b/src/pacman/sync.c
@@ -813,9 +813,6 @@ int sync_prepare_execute(void)
alpm_strerror(err));
switch(err) {
case ALPM_ERR_FILE_CONFLICTS:
- if(config->flags & ALPM_TRANS_FLAG_FORCE) {
- printf(_("unable to %s directory-file conflicts\n"), "--force");
- }
for(i = data; i; i = alpm_list_next(i)) {
alpm_fileconflict_t *conflict = i->data;
switch(conflict->type) {