summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Griffin <aaronmgriffin@gmail.com>2009-03-09 20:24:43 +0100
committerAaron Griffin <aaronmgriffin@gmail.com>2009-03-09 20:24:43 +0100
commitb3b1cfba424a4a48818071e267167b54bd4e1687 (patch)
treea978efbafdd6dd39eeeb11ed3cf5aca49d573586
parent486375ba0aedb185b369946fe565538c0f8e7949 (diff)
downloaddevtools-b3b1cfba424a4a48818071e267167b54bd4e1687.tar.gz
devtools-b3b1cfba424a4a48818071e267167b54bd4e1687.tar.xz
makechrootpkg: Don't fail if no chroot namcap
The call to namcap was causing the script to fail if namcap didn't exist or returned 1. Fix that by always returning 0... Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
-rwxr-xr-xmakechrootpkg3
1 files changed, 2 insertions, 1 deletions
diff --git a/makechrootpkg b/makechrootpkg
index 0411983..7e5d9f6 100755
--- a/makechrootpkg
+++ b/makechrootpkg
@@ -214,7 +214,8 @@ export LANG=$LOCALE
cd /build
export HOME=/build
sudo -u nobody makepkg $MAKEPKG_ARGS || touch BUILD_FAILED
-namcap *.pkg.tar.gz > /pkgdest/namcap.log
+which namcap 2>&1 >/dev/null && namcap *.pkg.tar.gz > /pkgdest/namcap.log
+exit 0
EOF
) > "$uniondir/chrootbuild"
chmod +x "$uniondir/chrootbuild"