| index : pacman | |
| Archlinux32 fork of pacman | gitolite user |
| summaryrefslogtreecommitdiff |
| -rwxr-xr-x | contrib/gensync | 20 | ||||
| -rwxr-xr-x | contrib/updatesync | 18 |
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 |