This is an automated email from the ASF dual-hosted git repository.
vinayakumarb pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop-thirdparty.git
The following commit(s) were added to refs/heads/trunk by this push:
new efbab22 HADOOP-16820. ChangeLog and ReleaseNote are not packaged by
createrelease script. (#2)
efbab22 is described below
commit efbab22845d4bbc15149b5b3122ac5439477ab07
Author: Vinayakumar B <[email protected]>
AuthorDate: Wed Jan 22 12:41:13 2020 +0530
HADOOP-16820. ChangeLog and ReleaseNote are not packaged by createrelease
script. (#2)
---
dev-support/bin/create-release | 4 ++--
dev-support/bin/yetus-wrapper | 9 +++++++++
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/dev-support/bin/create-release b/dev-support/bin/create-release
index db767e2..75b80a1 100755
--- a/dev-support/bin/create-release
+++ b/dev-support/bin/create-release
@@ -551,12 +551,12 @@ function makearelease
# Stage CHANGELOG and RELEASENOTES files
for i in CHANGELOG RELEASENOTES; do
- if [[ $(ls -l
"${BASEDIR}/src/site/markdown/release/${HADOOP_THIRDPARTY_VERSION}"/${i}*.md |
wc -l) == 0 ]]; then
+ if [[ $(ls -l
"${BASEDIR}/src/site/markdown/release/thirdparty-${HADOOP_THIRDPARTY_VERSION}"/${i}*.md
| wc -l) == 0 ]]; then
echo "No ${i} found. Continuing..."
continue;
fi
run cp -p \
-
"${BASEDIR}/src/site/markdown/release/${HADOOP_THIRDPARTY_VERSION}"/${i}*.md \
+
"${BASEDIR}/src/site/markdown/release/thirdparty-${HADOOP_THIRDPARTY_VERSION}"/${i}*.md
\
"${ARTIFACTS_DIR}/${i}.md"
done
diff --git a/dev-support/bin/yetus-wrapper b/dev-support/bin/yetus-wrapper
index b0f71f1..ec6a02b 100755
--- a/dev-support/bin/yetus-wrapper
+++ b/dev-support/bin/yetus-wrapper
@@ -176,6 +176,15 @@ if ! (gunzip -c "${TARBALL}.gz" | tar xpf -); then
exit 1
fi
+if [[ "${WANTED}" == "releasedocmaker" ]]; then
+ # releasedocmaker expects versions to be in form of x.y.z to generate index
and readme files.
+ # But thirdparty version will be in form of 'thirdparty-x.y.z'
+ if [[ -x
"${HADOOP_PATCHPROCESS}/${YETUS_PREFIX}-${HADOOP_YETUS_VERSION}/lib/releasedocmaker/releasedocmaker/__init__.py"
]]; then
+ sed -i 's@glob(\"@glob(\"thirdparty-@g'
"${HADOOP_PATCHPROCESS}/${YETUS_PREFIX}-${HADOOP_YETUS_VERSION}/lib/releasedocmaker/releasedocmaker/__init__.py"
+ sed -i 's@%s v%s@%s %s@g'
"${HADOOP_PATCHPROCESS}/${YETUS_PREFIX}-${HADOOP_YETUS_VERSION}/lib/releasedocmaker/releasedocmaker/__init__.py"
+ fi
+fi
+
if [[ -x
"${HADOOP_PATCHPROCESS}/${YETUS_PREFIX}-${HADOOP_YETUS_VERSION}/bin/${WANTED}"
]]; then
popd >/dev/null
exec
"${HADOOP_PATCHPROCESS}/${YETUS_PREFIX}-${HADOOP_YETUS_VERSION}/bin/${WANTED}"
"${ARGV[@]}"
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
