Updated Branches: refs/heads/master 13b20b0ca -> 9e4710678
Add link to branch shortlog Project: http://git-wip-us.apache.org/repos/asf/couchdb-admin/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-admin/commit/9e471067 Tree: http://git-wip-us.apache.org/repos/asf/couchdb-admin/tree/9e471067 Diff: http://git-wip-us.apache.org/repos/asf/couchdb-admin/diff/9e471067 Branch: refs/heads/master Commit: 9e47106784aefb3e1fe3764cc5245c18c816878f Parents: 13b20b0 Author: Noah Slater <[email protected]> Authored: Sat Mar 23 19:29:41 2013 +0000 Committer: Noah Slater <[email protected]> Committed: Sat Mar 23 19:29:41 2013 +0000 ---------------------------------------------------------------------- email/vote_release.txt | 2 +- release/publish_candidate.sh | 18 ++++++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-admin/blob/9e471067/email/vote_release.txt ---------------------------------------------------------------------- diff --git a/email/vote_release.txt b/email/vote_release.txt index c9cc577..5d48418 100644 --- a/email/vote_release.txt +++ b/email/vote_release.txt @@ -9,7 +9,7 @@ I would like to call a vote on Apache CouchDB %VERSION%-rc.%CANDIDATE%. Changes since last round: - * %CHANGES% + * https://git-wip-us.apache.org/repos/asf?p=couchdb.git;a=shortlog;h=refs/heads/%BRANCH% We encourage the whole community to download and test these release artefacts so that any critical issues can be resolved before the release is made. Everyone is free to vote on this release, so get stuck in! http://git-wip-us.apache.org/repos/asf/couchdb-admin/blob/9e471067/release/publish_candidate.sh ---------------------------------------------------------------------- diff --git a/release/publish_candidate.sh b/release/publish_candidate.sh index b486b5e..8a902c1 100755 --- a/release/publish_candidate.sh +++ b/release/publish_candidate.sh @@ -22,14 +22,21 @@ else fi if test -n "$2"; then - version=$2 + branch=$2 else - echo "error: no version" + echo "error: no branch" exit fi if test -n "$3"; then - candidate=$3 + version=$3 +else + echo "error: no version" + exit +fi + +if test -n "$4"; then + candidate=$4 else echo "error: no candidate number" exit @@ -62,6 +69,8 @@ EMAIL_TPL=$EMAIL_TPL EMAIL_FILE=\$(TMP_DIR)/email.txt +BRANCH=$branch + VERSION=$version CANDIDATE=$candidate @@ -120,7 +129,8 @@ check: \$(SVN_DIR) email: \$(EMAIL_FILE) \$(EMAIL_FILE): \$(EMAIL_TPL) - sed -e "s|%VERSION%|\$(VERSION)|g" \ + sed -e "s|%BRANCH%|\$(BRANCH)|g" \ + -e "s|%VERSION%|\$(VERSION)|g" \ -e "s|%CANDIDATE%|\$(CANDIDATE)|g" \ -e "s|%CANDIDATE_URL%|\$(CANDIDATE_URL)|g" \ -e "s|%PACKAGE%|\$(PACKAGE)|g" > \
