Repository: yetus Updated Branches: refs/heads/master f21a7c015 -> 9e05f970e
YETUS-220. can't cat the version file in re-exec or dockermode Signed-off-by: Sean Busbey <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/yetus/repo Commit: http://git-wip-us.apache.org/repos/asf/yetus/commit/9e05f970 Tree: http://git-wip-us.apache.org/repos/asf/yetus/tree/9e05f970 Diff: http://git-wip-us.apache.org/repos/asf/yetus/diff/9e05f970 Branch: refs/heads/master Commit: 9e05f970ea90fd7fbacda48a058da516ccd07364 Parents: f21a7c0 Author: Allen Wittenauer <[email protected]> Authored: Thu Dec 10 08:48:20 2015 -0800 Committer: Allen Wittenauer <[email protected]> Committed: Thu Dec 10 09:55:16 2015 -0800 ---------------------------------------------------------------------- precommit/test-patch.sh | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/yetus/blob/9e05f970/precommit/test-patch.sh ---------------------------------------------------------------------- diff --git a/precommit/test-patch.sh b/precommit/test-patch.sh index f65f1be..c5ac5ca 100755 --- a/precommit/test-patch.sh +++ b/precommit/test-patch.sh @@ -1386,6 +1386,11 @@ function copytpbits # shellcheck disable=SC2164 (cd "${BINDIR}"; tar cpf - . ) | (cd "${PATCH_DIR}/precommit"; tar xpf - ) + if [[ ! -f "${BINDIR}/VERSION" + && -f "${BINDIR}/../VERSION" ]]; then + cp -p "${BINDIR}/../VERSION" "${PATCH_DIR}/precommit/VERSION" + fi + if [[ -n "${USER_PLUGIN_DIR}" && -d "${USER_PLUGIN_DIR}" ]]; then yetus_debug "copying '${USER_PLUGIN_DIR}' over to ${PATCH_DIR}/precommit/user-plugins" @@ -1993,7 +1998,11 @@ function bugsystem_finalreport declare version declare bugs - version=$(cat "${BINDIR}/../VERSION") + if [[ -f "${BINDIR}/../VERSION" ]]; then + version=$(cat "${BINDIR}/../VERSION") + elif [[ -f "${BINDIR}/VERSION" ]]; then + version=$(cat "${BINDIR}/VERSION") + fi add_footer_table "Powered by" "Apache Yetus ${version} http://yetus.apache.org";
