--- branches/mage-next/src/smage2.in 2014/09/02 13:55:19 2806 +++ branches/mage-next/src/smage2.in 2015/02/13 09:58:19 2864 @@ -404,17 +404,17 @@ # automatically set !pkgbuild here too msetfeature "!pkgbuild" else - ( run_resume pkg_setup || pkg_setup ) | ${SMAGE_LOG_CMD} + ( run_resume pkg_setup || pkg_setup ) |& ${SMAGE_LOG_CMD} die_pipestatus 0 "pkg_setup failed" resume_stamp pkg_setup step_by_step pkg_setup - ( run_resume src_prepare || src_prepare ) | ${SMAGE_LOG_CMD} + ( run_resume src_prepare || src_prepare ) |& ${SMAGE_LOG_CMD} die_pipestatus 0 "src_prepare failed" resume_stamp src_prepare step_by_step src_prepare - ( run_resume src_compile || src_compile ) | ${SMAGE_LOG_CMD} + ( run_resume src_compile || src_compile ) |& ${SMAGE_LOG_CMD} die_pipestatus 0 "src_compile failed" resume_stamp src_compile step_by_step src_compile @@ -422,9 +422,9 @@ # only run checks if requested if mqueryfeature "!check" then - echo "!check detected; src_check() will not be run!" | ${SMAGE_LOG_CMD} + echo "!check detected; src_check() will not be run!" |& ${SMAGE_LOG_CMD} else - ( run_resume src_check || src_check ) | ${SMAGE_LOG_CMD} + ( run_resume src_check || src_check ) |& ${SMAGE_LOG_CMD} die_pipestatus 0 "src_check failed" resume_stamp src_check fi @@ -465,7 +465,7 @@ echo -en " for subpkg: ${COLBLUE}${PNAME}${COLDEFAULT}" echo -e " - basepkg: ${COLBLUE}${SPLIT_PACKAGE_BASE}${COLDEFAULT} ..." - ( run_resume src_install_${subpackage} || src_install_${subpackage} ) | ${SMAGE_LOG_CMD} + ( run_resume src_install_${subpackage} || src_install_${subpackage} ) |& ${SMAGE_LOG_CMD} die_pipestatus 0 "src_install_${subpackage} failed" resume_stamp src_install_${subpackage} step_by_step src_install_${subpackage} @@ -477,7 +477,7 @@ # unset all saved smage variables split_unset_variables else - ( run_resume src_install || src_install ) | ${SMAGE_LOG_CMD} + ( run_resume src_install || src_install ) |& ${SMAGE_LOG_CMD} die_pipestatus 0 "src_install failed" resume_stamp src_install step_by_step src_install