From c26ba3ccee6700bc0be0031df959d96918f7800f Mon Sep 17 00:00:00 2001 From: Florian Pritz Date: Sat, 9 Jul 2011 09:55:08 +0200 Subject: db-remove: remove package if not in svn We know what the user wants us to do (remove a package from the repo and svn) so if it's not in svn it should still be removed from the db. Having to use a seperate tool (db-repo-remove) is confusing. Signed-off-by: Florian Pritz Signed-off-by: Pierre Schmitz --- db-remove | 3 +++ 1 file changed, 3 insertions(+) (limited to 'db-remove') diff --git a/db-remove b/db-remove index 292af5d..b44eb33 100755 --- a/db-remove +++ b/db-remove @@ -38,6 +38,9 @@ if [ -d "${WORKDIR}/svn/$pkgbase/repos/$svnrepo" ]; then /usr/bin/svn commit -q "${WORKDIR}/svn/$pkgbase" -m "$(basename $0): $pkgbase removed by $(id -un)" else warning "$pkgbase not found in $svnrepo" + 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 -- cgit v1.2.3-2-g168b From d438ff5d25372ba32e42f89c808f5b33a25042f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Reynolds?= Date: Wed, 3 Aug 2011 16:13:56 -0300 Subject: Changed SVN to ABSLibre --- db-remove | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'db-remove') diff --git a/db-remove b/db-remove index b44eb33..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,11 @@ 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) -- cgit v1.2.3-2-g168b