Merge branch 'master' of http://projects.parabolagnulinux.org/dbscripts into stable

4 files changed, 15 insertions, 14 deletions

diff --git a/cron-jobs/check_archlinux/parse_pkgbuilds.sh b/cron-jobs/check_archlinux/parse_pkgbuilds.sh
index 5cd17e4..3f92169 100755
--- a/cron-jobs/check_archlinux/parse_pkgbuilds.sh
+++ b/cron-jobs/check_archlinux/parse_pkgbuilds.sh
@@ -6,7 +6,7 @@
 exit() { return; }
 
 splitpkg_overrides=('depends' 'optdepends' 'provides' 'conflicts')
-variables=('pkgname' 'pkgbase' 'pkgver' 'pkgrel' 'makedepends' 'arch' ${splitpkg_overrides[@]})
+variables=('pkgname' 'pkgbase' 'epoch' 'pkgver' 'pkgrel' 'makedepends' 'arch' ${splitpkg_overrides[@]})
 readonly -a variables splitpkg_overrides
 
 backup_package_variables() {
@@ -29,7 +29,11 @@ restore_package_variables() {
 
 print_info() {
 	echo -e "%NAME%\n$pkgname\n"
-	echo -e "%VERSION%\n$pkgver-$pkgrel\n"
+	if [ -n "$epoch" ]; then
+		echo -e "%VERSION%\n$epoch:$pkgver-$pkgrel\n"
+	else
+		echo -e "%VERSION%\n$pkgver-$pkgrel\n"
+	fi
 	echo -e "%PATH%\n$dir\n"
 
 	if [ -n "$pkgbase" ]; then
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
diff --git a/test/lib/common.inc b/test/lib/common.inc
index eb46508..c96e677 100644
--- a/test/lib/common.inc
+++ b/test/lib/common.inc
@@ -11,7 +11,7 @@ oneTimeSetUp() {
 	local pkgarch
 	local pkgversion
 	local build
-	pkgdir="$(mktemp -d /dev/shm/$(basename $0).XXXXXXXXXX)"
+	pkgdir="$(mktemp -d /tmp/$(basename $0).XXXXXXXXXX)"
 	cp -Lr $(dirname ${BASH_SOURCE[0]})/../packages/* "${pkgdir}"
 	msg 'Building packages...'
 	for d in "${pkgdir}"/*; do
diff --git a/test/test.d/packages.sh b/test/test.d/packages.sh
index 324f73a..488cb15 100755
--- a/test/test.d/packages.sh
+++ b/test/test.d/packages.sh
@@ -4,8 +4,8 @@ curdir=$(readlink -e $(dirname $0))
 . "${curdir}/../lib/common.inc"
 
 testPackages() {
-	# TODO: namcap -r depends fails with i686 packages
-	find "${pkgdir}" -name "*${PKGEXT}" -exec namcap -e depends {} + || fail 'namcap failed'
+	# TODO: namcap -r sodepends fails with i686 packages
+	find "${pkgdir}" -name "*${PKGEXT}" -exec namcap -e sodepends,pkgnameindesc {} + || fail 'namcap failed'
 }
 
 . "${curdir}/../lib/shunit2"