remove --force option from repo-add.

The force option should only be specified in the PKGBUILD with
options=(force).  This information should be handled like any other meta
info, and there is no need to have a special repo-add option for it.

Signed-off-by: Chantry Xavier <shiningxc@gmail.com>
[Dan: fix up a few more references in contrib/ scripts, etc]
Signed-off-by: Dan McGee <dan@archlinux.org>

1 files changed, 4 insertions, 8 deletions

diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in
index efd3bc03..00eec7ec 100644
--- a/scripts/repo-add.sh.in
+++ b/scripts/repo-add.sh.in
@@ -25,7 +25,6 @@ export TEXTDOMAINDIR='@localedir@'
 myver='@PACKAGE_VERSION@'
 confdir='@sysconfdir@'
 
-FORCE=0
 REPO_DB_FILE=""
 
 # ensure we have a sane umask set
@@ -54,14 +53,10 @@ error() {
 # print usage instructions
 usage() {
 	printf "repo-add (pacman) %s\n\n" "$myver"
-	printf "$(gettext "Usage: %s <path-to-db> [--force] <package> ...\n\n")" "$0"
+	printf "$(gettext "Usage: %s <path-to-db> <package> ...\n\n")" "$0"
 	printf "$(gettext "\
 repo-add will update a package database by reading a package file.\n\
 Multiple packages to add can be specified on the command line.\n\n")"
-	printf "$(gettext "\
-The --force flag will add a 'force' entry to the sync database, which\n\
-tells pacman to skip its internal version number checking and update\n\
-the package regardless.\n\n")"
 	echo "$(gettext "Example:  repo-add /path/to/repo.db.tar.gz pacman-3.0.0.pkg.tar.gz")"
 }
 
@@ -209,7 +204,7 @@ db_write_entry()
 	[ -n "$builddate" ] && echo -e "%BUILDDATE%\n$builddate\n" >>desc
 	[ -n "$packager" ] && echo -e "%PACKAGER%\n$packager\n" >>desc
 	write_list_entry "REPLACES" "$_replaces" "desc"
-	[ $FORCE -eq 1 -o -n "$force" ] && echo -e "%FORCE%\n" >>desc
+	[ -n "$force" ] && echo -e "%FORCE%\n" >>desc
 
 	# create depends entry
 	msg2 "$(gettext "Creating 'depends' db entry...")"
@@ -291,7 +286,8 @@ success=0
 # parse arguments
 for arg in "$@"; do
 	if [ "$arg" == "--force" -o "$arg" == "-f" ]; then
-		FORCE=1
+		warning "$(gettext "the -f and --force options are no longer recognized")"
+		msg2 "$(gettext "use options=(force) in the PKGBUILD instead")"
 	elif [ -z "$REPO_DB_FILE" ]; then
 		REPO_DB_FILE=$(readlink -f "$arg")
 		if ! test_repo_db_file; then