In dyn_package(), use the 'assert' macro (from isolated-functions.sh) die if
authorZac Medico <zmedico@gentoo.org>
Fri, 14 Nov 2008 18:41:58 +0000 (18:41 -0000)
committerZac Medico <zmedico@gentoo.org>
Fri, 14 Nov 2008 18:41:58 +0000 (18:41 -0000)
PIPESTATUS array contains a non-zero exist status. (trunk r11907)

svn path=/main/branches/2.1.6/; revision=11910

bin/misc-functions.sh

index f2e41bed8f37d514f0c02801b1f32b522e77520c..f1f70553820e0ecdb453d540486ba8224cda5cee 100755 (executable)
@@ -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