From b1103a3eaf0c6bb2982ac90000628baa2d5c2079 Mon Sep 17 00:00:00 2001 From: Alex Merry Date: Sat, 2 Feb 2008 10:09:06 -0600 Subject: updatesync: incorrect package deletion logic Fixes FS#9279. Signed-off-by: Dan McGee --- scripts/updatesync.sh.in | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/scripts/updatesync.sh.in b/scripts/updatesync.sh.in index 900f11f3..c777d1f1 100644 --- a/scripts/updatesync.sh.in +++ b/scripts/updatesync.sh.in @@ -116,11 +116,11 @@ if [ "$4" != "" ]; then fi opt_force="" -if [ ! -f "$option" ]; then - die "$(gettext "%s not found")" $option -fi - if [ "$action" = "upd" ]; then # INSERT / UPDATE + if [ ! -f "$option" ]; then + die "$(gettext "%s not found")" $option + fi + unset pkgname pkgver pkgrel options source $option || die "$(gettext "failed to parse %s")" $option @@ -141,10 +141,14 @@ if [ "$action" = "upd" ]; then # INSERT / UPDATE else # DELETE fname="$(basename $option)" if [ "$fname" = "PKGBUILD" ]; then + if [ ! -f "$option" ]; then + die "$(gettext "%s not found")" $option + fi + unset pkgname pkgver pkgrel options source $option else - pkgname=$1 + pkgname=$option fi repo-remove "$pkgdb" "$pkgname" -- cgit v1.2.3-70-g09d2