Merge branch 'master' of https://projects.parabolagnulinux.org/dbscripts

Conflicts:
	config

1 files changed, 6 insertions, 9 deletions

diff --git a/db-remove b/db-remove
index 292af5d..ccfeb36 100755
--- a/db-remove
+++ b/db-remove
@@ -12,9 +12,6 @@ pkgbase="$1"
 repo="$2"
 arch="$3"
 
-ftppath="$FTP_BASE/$repo/os"
-svnrepo="$repo-$arch"
-
 if ! check_repo_permission $repo; then
 	die "You don't have permission to remove packages from ${repo}"
 fi
@@ -30,14 +27,14 @@ for tarch in ${tarches[@]}; do
 done
 
 msg "Removing $pkgbase from [$repo]..."
-/usr/bin/svn checkout -q "${SVNREPO}/${pkgbase}" "${WORKDIR}/svn/${pkgbase}" >/dev/null
 
-if [ -d "${WORKDIR}/svn/$pkgbase/repos/$svnrepo" ]; then
-	pkgnames=($(. "${WORKDIR}/svn/$pkgbase/repos/$svnrepo/PKGBUILD"; echo ${pkgname[@]}))
-	/usr/bin/svn rm --force -q "${WORKDIR}/svn/$pkgbase/repos/$svnrepo"
-	/usr/bin/svn commit -q "${WORKDIR}/svn/$pkgbase" -m "$(basename $0): $pkgbase removed by $(id -un)"
+if [ -d "${SVNREPO}/$repo/$pkgbase" ]; then
+	pkgnames=($(. "${SVNREPO}/$repo/$pkgbase/PKGBUILD"; echo ${pkgname[@]}))
 else
-	warning "$pkgbase not found in $svnrepo"
+	warning "$pkgbase not found in $repo"
+	warning "Removing only $pkgbase from the repo"
+	warning "If it was a split package you have to remove the others yourself!"
+	pkgnames=($pkgbase)
 fi
 
 for tarch in ${tarches[@]}; do