Merge pull request #1990 from liubin/1989/fix-log-message

osbuilder: fix log message that is not error but seems like an error
This commit is contained in:
Tim Zhang 2021-06-15 15:13:21 +08:00 committed by GitHub
commit c881899903
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -583,7 +583,9 @@ EOT
info "Build agent"
pushd "${agent_dir}"
[ -n "${AGENT_VERSION}" ] && git checkout "${AGENT_VERSION}" && OK "git checkout successful" || info "checkout failed!"
if [ -n "${AGENT_VERSION}" ]; then
git checkout "${AGENT_VERSION}" && OK "git checkout successful" || die "checkout agent ${AGENT_VERSION} failed!"
fi
make clean
make LIBC=${LIBC} INIT=${AGENT_INIT}
make install DESTDIR="${ROOTFS_DIR}" LIBC=${LIBC} INIT=${AGENT_INIT} SECCOMP=${SECCOMP}