From f144f88fdb8727f87822712db07a377d0585667d Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 14 Nov 2008 18:39:55 +0000 Subject: [PATCH] In dyn_package(), use the 'assert' macro (from isolated-functions.sh) die if PIPESTATUS array contains a non-zero exist status. svn path=/main/trunk/; revision=11909 --- bin/misc-functions.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh index f2e41bed8..f1f705538 100755 --- a/bin/misc-functions.sh +++ b/bin/misc-functions.sh @@ -637,8 +637,8 @@ dyn_package() { PORTAGE_BINPKG_TMPFILE="${PKGDIR}/${CATEGORY}/${PF}.tbz2" mkdir -p "${PORTAGE_BINPKG_TMPFILE%/*}" || die "mkdir failed" tar $tar_options -cf - $PORTAGE_BINPKG_TAR_OPTS -C "${D}" . | \ - bzip2 -f > "$PORTAGE_BINPKG_TMPFILE" || \ - die "Failed to create tarball" + bzip2 -f > "$PORTAGE_BINPKG_TMPFILE" + assert PYTHONPATH=${PORTAGE_PYM_PATH}${PYTHONPATH:+:}${PYTHONPATH} \ python -c "from portage import xpak; t=xpak.tbz2('${PORTAGE_BINPKG_TMPFILE}'); t.recompose('${PORTAGE_BUILDDIR}/build-info')" if [ $? -ne 0 ]; then -- 2.26.2