From e06e1dbf1f677a1af4f4ea9b3e7e3ceaa6c3b5f5 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 17 Oct 2006 10:21:39 +0000 Subject: [PATCH] Add back the -v option for tar (removed for bug #151146) in dyn_package(), but don't enable -v when --quiet is enabled. svn path=/main/trunk/; revision=4737 --- bin/misc-functions.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh index b9205ded9..9ae010e4d 100755 --- a/bin/misc-functions.sh +++ b/bin/misc-functions.sh @@ -354,10 +354,13 @@ dyn_package() { install_mask "${PORTAGE_BUILDDIR}/image" ${PKG_INSTALL_MASK} local pkg_dest="${PKGDIR}/All/${PF}.tbz2" local pkg_tmp="${PKGDIR}/All/${PF}.tbz2.$$" + local tar_options="" + [ "${PORTAGE_QUIET}" == "1" ] || tar_options="${tar_options} -v" # Sandbox is disabled in case the user wants to use a symlink # for $PKGDIR and/or $PKGDIR/All. export SANDBOX_ON="0" - tar -cf - . | bzip2 -f > "${pkg_tmp}" || die "Failed to create tarball" + tar ${tar_options} -cf - . | bzip2 -f > "${pkg_tmp}" || \ + die "Failed to create tarball" cd .. export PYTHONPATH=${PORTAGE_PYM_PATH:-/usr/lib/portage/pym} python -c "import xpak; t=xpak.tbz2('${pkg_tmp}'); t.recompose('${PORTAGE_BUILDDIR}/build-info')" -- 2.26.2