From acc602ead426a2bd66c1ecc9b41261fb57392594 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Sun, 24 Jul 2011 21:32:18 +0200 Subject: Use /tmp instead of /dev/shm for temporary files --- test/lib/common.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.3 From 7d3481f9458241523116266d9c4c6592082aa346 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Sun, 24 Jul 2011 21:32:48 +0200 Subject: Fix test for use with recent namcap releases --- test/test.d/packages.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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" -- cgit v1.2.3 From 4e2e92406a4a8b71e3bb9665fbf09b69e39a9f55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eric=20B=C3=A9langer?= Date: Fri, 8 Jul 2011 18:03:48 -0400 Subject: Add epoch support to integrity check cron job MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Eric Bélanger Signed-off-by: Pierre Schmitz --- cron-jobs/check_archlinux/parse_pkgbuilds.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 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 -- cgit v1.2.3 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(+) 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