From: Zac Medico Date: Fri, 14 Nov 2008 18:41:58 +0000 (-0000) Subject: In dyn_package(), use the 'assert' macro (from isolated-functions.sh) die if X-Git-Tag: v2.1.6_rc1~74 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=57c4a04ed7ec806b2e5e29eb0c75d485fd1fc2ec;p=portage.git In dyn_package(), use the 'assert' macro (from isolated-functions.sh) die if PIPESTATUS array contains a non-zero exist status. (trunk r11907) svn path=/main/branches/2.1.6/; revision=11910 --- 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