commit: 44b56bd2f82a7344ab833695e52cde5dc8bffe9d
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 7 07:01:24 2017 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Thu Dec 7 07:01:35 2017 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=44b56bd2
catalyst: do not use --purge so we can hit binpkgcache.
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
scripts/stage_build.sh | 2 +-
tools/catalyst-auto | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/scripts/stage_build.sh b/scripts/stage_build.sh
index 0dd89a9b..46902c1e 100755
--- a/scripts/stage_build.sh
+++ b/scripts/stage_build.sh
@@ -152,7 +152,7 @@ for i in 1 2 3; do
else
echo "source_subpath: default/stage$(expr ${i} -
1)-${subarch}-${version_stamp}" >> stage${i}.spec
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
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
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index 86c654f6..3f7d84ef 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -326,7 +326,7 @@ for a in "" ${SETS}; do
for i in ${!specs_var}; do
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
build_failure=1
send_email "Catalyst fatal build error - ${i}" "" "${LOGFILE}"
@@ -336,7 +336,7 @@ for a in "" ${SETS}; do
for i in ${!optional_specs_var}; do
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
build_failure=1
send_email "Catalyst non-fatal build error - ${i}" "" "${LOGFILE}"
