From e81dec9b8c65f7c882f5f447cdc117783259f4a4 Mon Sep 17 00:00:00 2001
From: Chantry Xavier <shiningxc@gmail.com>
Date: Sat, 2 Feb 2008 23:24:49 +0100
Subject: 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>
---
 contrib/gensync    | 20 ++------------------
 contrib/updatesync | 18 +-----------------
 2 files changed, 3 insertions(+), 35 deletions(-)

(limited to 'contrib')

diff --git a/contrib/gensync b/contrib/gensync
index 04df52ac..51d32ceb 100755
--- a/contrib/gensync
+++ b/contrib/gensync
@@ -59,17 +59,6 @@ die () {
 	exit 1
 }
 
-check_force () {
-	local i
-	for i in ${options[@]}; do
-		local lc=$(echo $i | tr [:upper:] [:lower:])
-		if [ "$lc" = "force" ]; then
-			true
-		fi
-	done
-	false
-}
-
 # PROGRAM START
 
 if [ "$1" = "-h" -o "$1" = "--help" ]; then
@@ -115,7 +104,6 @@ echo "gensync: building database entries, generating md5sums..." >&2
 cd "$destdir"
 
 pkgs=""
-forcepkgs=""
 
 for file in $(find "$rootdir"/* -name "$BUILDSCRIPT"); do
 	unset pkgname pkgver pkgrel options
@@ -133,18 +121,14 @@ for file in $(find "$rootdir"/* -name "$BUILDSCRIPT"); do
 	if [ ! -f "$pkgfile" ]; then
 		error "could not find %s-%s-%s-%s%s - skipping" $pkgname $pkgver $pkgrel $CARCH $PKGEXT
 	else
-		if check_force; then
-			forcepkgs="$forcepkgs $pkgfile"
-		else
-			pkgs="$pkgs $pkgfile"
-		fi
+		pkgs="$pkgs $pkgfile"
 	fi
 done
 
 echo "creating repo DB..."
 
 # we'll trim the output just a tad, as gensync may be used on large repos
-repo-add $destfile $pkgs --force $force_pkgs \
+repo-add $destfile $pkgs \
 		| grep -e "package" -e "database"
 
 # vim: set ts=2 sw=2 noet:
diff --git a/contrib/updatesync b/contrib/updatesync
index 9d5d54e9..f88e8237 100755
--- a/contrib/updatesync
+++ b/contrib/updatesync
@@ -58,17 +58,6 @@ die () {
 	exit 1
 }
 
-check_force () {
-	local i
-	for i in ${options[@]}; do
-		local lc=$(echo $i | tr [:upper:] [:lower:])
-		if [ "$lc" = "force" ]; then
-			true
-		fi
-	done
-	false
-}
-
 # PROGRAM START
 
 if [ "$1" = "-h" -o "$1" = "--help" ]; then
@@ -109,7 +98,6 @@ pkgdir="$(pwd)"
 if [ "$4" != "" ]; then
 	pkgdir="$4"
 fi
-opt_force=""
 
 if [ "$action" = "upd" ]; then # INSERT / UPDATE
 	if [ ! -f "$option" ]; then
@@ -128,11 +116,7 @@ if [ "$action" = "upd" ]; then # INSERT / UPDATE
 		die "could not find %s-%s-%s-%s%s - aborting" $pkgname $pkgver $pkgrel $CARCH $PKGEXT
 	fi
 
-	if check_force; then
-		opt_force="--force"
-	fi
-
-	repo-add "$pkgdb" $opt_force "$pkgfile"
+	repo-add "$pkgdb" "$pkgfile"
 else # DELETE
 	fname="$(basename $option)"
 	if [ "$fname" = "PKGBUILD" ]; then
-- 
cgit v1.2.3-24-g4f1b