summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre Schmitz <pierre@archlinux.de>2011-11-06 10:31:37 +0100
committerPierre Schmitz <pierre@archlinux.de>2011-11-06 10:31:37 +0100
commitbf96c9f949aea3ef66769a2aae78d5cf4c777458 (patch)
treec6d01b51891309d1ba454bf0dcd914b84be69faf
parenta030cdc532269521eba07c57137760a969e788a4 (diff)
downloaddevtools32-bf96c9f949aea3ef66769a2aae78d5cf4c777458.tar.xz
makechrootpkg: Create separate namcap log for every single file
-rw-r--r--makechrootpkg.in9
1 files changed, 6 insertions, 3 deletions
diff --git a/makechrootpkg.in b/makechrootpkg.in
index d128ff4..8e0b6ee 100644
--- a/makechrootpkg.in
+++ b/makechrootpkg.in
@@ -274,7 +274,10 @@ sudo -u nobody makepkg $makepkg_args || touch BUILD_FAILED
if $run_namcap; then
pacman -S --needed --noconfirm namcap
- namcap /build/PKGBUILD /pkgdest/*.pkg.tar.?z > /build/namcap.log
+ for pkgfile in /build/PKGBUILD /pkgdest/*.pkg.tar.?z; do
+ echo "Checking \${pkgfile##*/}"
+ namcap "\$pkgfile" 2>&1 | tee "/build/\${pkgfile##*/}-namcap.log"
+ done
fi
exit 0
@@ -282,7 +285,7 @@ EOF
chmod +x "$copydir/chrootbuild"
if mkarchroot -r "/chrootbuild" "$copydir"; then
- for pkgfile in "$copydir"/pkgdest/*.pkg.tar.*; do
+ for pkgfile in "$copydir"/pkgdest/*.pkg.tar.?z; do
if $add_to_db; then
mkdir -p "$copydir/repo"
pushd "$copydir/repo" >/dev/null
@@ -294,7 +297,7 @@ if mkarchroot -r "/chrootbuild" "$copydir"; then
mv "$pkgfile" "$PKGDEST"
done
- for l in "$copydir"/build/{namcap,*-{build,check,package,package_*}}.log; do
+ for l in "$copydir"/build/*-{build,check,namcap,package,package_*}.log; do
[[ -f $l ]] && mv "$l" .
done
else