You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@yetus.apache.org by aw...@apache.org on 2016/02/10 19:17:25 UTC
yetus git commit: YETUS-215. cli flag for "license" does the opposite
of docs
Repository: yetus
Updated Branches:
refs/heads/master 0868072cd -> 83342e013
YETUS-215. cli flag for "license" does the opposite of docs
Signed-off-by: Sean Busbey <bu...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/yetus/repo
Commit: http://git-wip-us.apache.org/repos/asf/yetus/commit/83342e01
Tree: http://git-wip-us.apache.org/repos/asf/yetus/tree/83342e01
Diff: http://git-wip-us.apache.org/repos/asf/yetus/diff/83342e01
Branch: refs/heads/master
Commit: 83342e013266ae5626d30aa27de6767cb60919b1
Parents: 0868072
Author: Allen Wittenauer <aw...@apache.org>
Authored: Tue Feb 9 12:58:57 2016 -0800
Committer: Allen Wittenauer <aw...@apache.org>
Committed: Wed Feb 10 10:17:07 2016 -0800
----------------------------------------------------------------------
build.sh | 13 ++++---------
release-doc-maker/releasedocmaker.py | 4 ++--
2 files changed, 6 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/yetus/blob/83342e01/build.sh
----------------------------------------------------------------------
diff --git a/build.sh b/build.sh
index f0545d1..6b23683 100755
--- a/build.sh
+++ b/build.sh
@@ -76,16 +76,11 @@ mkdir -p target
if [ "${offline}" != "true" ]; then
JIRA_VERSION="${YETUS_VERSION%%-SNAPSHOT}"
echo "generating release docs."
- # working around YETUS-214
- # no --license flag, YETUS-215
- rn_out=$(cd target && \
- ../release-doc-maker/releasedocmaker.py --lint \
+ release-doc-maker/releasedocmaker.py --lint --license --outputdir target \
--project YETUS "--version=${JIRA_VERSION}" \
- --projecttitle="Apache Yetus" --usetoday && \
- mv "${JIRA_VERSION}/RELEASENOTES.${JIRA_VERSION}.md" RELEASENOTES.md && \
- mv "${JIRA_VERSION}/CHANGES.${JIRA_VERSION}.md" CHANGES.md \
- )
- echo "${rn_out}"
+ --projecttitle="Apache Yetus" --usetoday
+ mv "target/${JIRA_VERSION}/RELEASENOTES.${JIRA_VERSION}.md" target/RELEASENOTES.md
+ mv "target/${JIRA_VERSION}/CHANGES.${JIRA_VERSION}.md" target/CHANGES.md
else
echo "in offline mode, skipping release notes."
fi
http://git-wip-us.apache.org/repos/asf/yetus/blob/83342e01/release-doc-maker/releasedocmaker.py
----------------------------------------------------------------------
diff --git a/release-doc-maker/releasedocmaker.py b/release-doc-maker/releasedocmaker.py
index 3d6b62e..ae4e587 100755
--- a/release-doc-maker/releasedocmaker.py
+++ b/release-doc-maker/releasedocmaker.py
@@ -450,8 +450,8 @@ def main():
"in a directory named after the highest version provided.")
parser.add_option("-i", "--index", dest="index", action="store_true",
default=False, help="build an index file")
- parser.add_option("-l", "--license", dest="license", action="store_false",
- default=True, help="Add an ASF license")
+ parser.add_option("-l", "--license", dest="license", action="store_true",
+ default=False, help="Add an ASF license")
parser.add_option("-n", "--lint", dest="lint", action="store_true",
help="use lint flag to exit on failures")
parser.add_option("-p", "--project", dest="projects",