catalyst: do not use --purge so we can hit binpkgcache.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
This commit is contained in:
parent
381936c795
commit
44b56bd2f8
|
@ -152,7 +152,7 @@ for i in 1 2 3; do
|
||||||
else
|
else
|
||||||
echo "source_subpath: default/stage$(expr ${i} - 1)-${subarch}-${version_stamp}" >> stage${i}.spec
|
echo "source_subpath: default/stage$(expr ${i} - 1)-${subarch}-${version_stamp}" >> stage${i}.spec
|
||||||
fi
|
fi
|
||||||
run_cmd "catalyst -a -p -c ${config} -f stage${i}.spec" "/tmp/catalyst_build_stage${i}.${PID}.log"
|
run_cmd "catalyst -a -c ${config} -f stage${i}.spec" "/tmp/catalyst_build_stage${i}.${PID}.log"
|
||||||
if [ $? != 0 ]; then
|
if [ $? != 0 ]; then
|
||||||
send_email "Catalyst build error - stage${i}" "$(tail -n 200 /tmp/catalyst_build_stage${i}.${PID}.log)\r\n\r\nFull build log at /tmp/catalyst_build_stage${i}.${PID}.log"
|
send_email "Catalyst build error - stage${i}" "$(tail -n 200 /tmp/catalyst_build_stage${i}.${PID}.log)\r\n\r\nFull build log at /tmp/catalyst_build_stage${i}.${PID}.log"
|
||||||
exit 1
|
exit 1
|
||||||
|
|
|
@ -326,7 +326,7 @@ for a in "" ${SETS}; do
|
||||||
|
|
||||||
for i in ${!specs_var}; do
|
for i in ${!specs_var}; do
|
||||||
LOGFILE="${TMPDIR}/log/$(echo "${i}" | sed -e 's:/:_:' -e 's:\.spec$::').log"
|
LOGFILE="${TMPDIR}/log/$(echo "${i}" | sed -e 's:/:_:' -e 's:\.spec$::').log"
|
||||||
run_cmd "${LOGFILE}" "${timeprefix[@]}" catalyst -a -p -c "${CATALYST_CONFIG}" -f "${i}"
|
run_cmd "${LOGFILE}" "${timeprefix[@]}" catalyst -a -c "${CATALYST_CONFIG}" -f "${i}"
|
||||||
if [ $? != 0 ]; then
|
if [ $? != 0 ]; then
|
||||||
build_failure=1
|
build_failure=1
|
||||||
send_email "Catalyst fatal build error - ${i}" "" "${LOGFILE}"
|
send_email "Catalyst fatal build error - ${i}" "" "${LOGFILE}"
|
||||||
|
@ -336,7 +336,7 @@ for a in "" ${SETS}; do
|
||||||
|
|
||||||
for i in ${!optional_specs_var}; do
|
for i in ${!optional_specs_var}; do
|
||||||
LOGFILE="${TMPDIR}/log/$(echo "${i}" | sed -e 's:/:_:' -e 's:\.spec$::').log"
|
LOGFILE="${TMPDIR}/log/$(echo "${i}" | sed -e 's:/:_:' -e 's:\.spec$::').log"
|
||||||
run_cmd "${LOGFILE}" "${timeprefix[@]}" catalyst -a -p -c "${CATALYST_CONFIG}" -f "${i}"
|
run_cmd "${LOGFILE}" "${timeprefix[@]}" catalyst -a -c "${CATALYST_CONFIG}" -f "${i}"
|
||||||
if [ $? != 0 ]; then
|
if [ $? != 0 ]; then
|
||||||
build_failure=1
|
build_failure=1
|
||||||
send_email "Catalyst non-fatal build error - ${i}" "" "${LOGFILE}"
|
send_email "Catalyst non-fatal build error - ${i}" "" "${LOGFILE}"
|
||||||
|
|
Loading…
Reference in a new issue