Remove the last traces of the pacman --force option

Signed-off-by: Allan McRae <[email protected]>

Author: allanmcrae

lib/libalpm/alpm.h

@@ -1461,8 +1461,7 @@ alpm_pkg_t *alpm_sync_newversion(alpm_pkg_t *pkg, alpm_list_t *dbs_sync);
 typedef enum _alpm_transflag_t {
 	/** Ignore dependency checks. */
 	ALPM_TRANS_FLAG_NODEPS = 1,
-	/** Ignore file conflicts and overwrite files. */
-	ALPM_TRANS_FLAG_FORCE = (1 << 1),
+	/* (1 << 1) flag can go here */
 	/** Delete files even if they are tagged as backup. */
 	ALPM_TRANS_FLAG_NOSAVE = (1 << 2),
 	/** Ignore version numbers when checking dependencies. */

lib/libalpm/conflict.c

@@ -401,8 +401,7 @@ static alpm_pkg_t *_alpm_find_file_owner(alpm_handle_t *handle, const char *path
 
 static int _alpm_can_overwrite_file(alpm_handle_t *handle, const char *path, const char *rootedpath)
 {
-	return handle->trans->flags & ALPM_TRANS_FLAG_FORCE
-		|| _alpm_fnmatch_patterns(handle->overwrite_files, path) == 0
+	return _alpm_fnmatch_patterns(handle->overwrite_files, path) == 0
 		|| _alpm_fnmatch_patterns(handle->overwrite_files, rootedpath) == 0;
 }
 

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;

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) {

test/pacman/tests/TESTS

@@ -276,11 +276,7 @@ TESTS += test/pacman/tests/upgrade005.py
 TESTS += test/pacman/tests/upgrade006.py
 TESTS += test/pacman/tests/upgrade010.py
 TESTS += test/pacman/tests/upgrade011.py
-TESTS += test/pacman/tests/upgrade012.py
 TESTS += test/pacman/tests/upgrade013.py
-TESTS += test/pacman/tests/upgrade014.py
-TESTS += test/pacman/tests/upgrade015.py
-TESTS += test/pacman/tests/upgrade016.py
 TESTS += test/pacman/tests/upgrade020.py
 TESTS += test/pacman/tests/upgrade021.py
 TESTS += test/pacman/tests/upgrade022.py
@@ -299,7 +295,6 @@ TESTS += test/pacman/tests/upgrade041.py
 TESTS += test/pacman/tests/upgrade042.py
 TESTS += test/pacman/tests/upgrade043.py
 TESTS += test/pacman/tests/upgrade045.py
-TESTS += test/pacman/tests/upgrade046.py
 TESTS += test/pacman/tests/upgrade050.py
 TESTS += test/pacman/tests/upgrade051.py
 TESTS += test/pacman/tests/upgrade052.py