Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 36F9E109ED for ; Sun, 5 Jan 2014 08:59:35 +0000 (UTC) Received: (qmail 1898 invoked by uid 500); 5 Jan 2014 08:56:54 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 1171 invoked by uid 500); 5 Jan 2014 08:55:56 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 907 invoked by uid 99); 5 Jan 2014 08:55:41 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 05 Jan 2014 08:55:41 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 023F84436A; Sun, 5 Jan 2014 08:55:40 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: benoitc@apache.org To: commits@couchdb.apache.org Date: Sun, 05 Jan 2014 08:55:53 -0000 Message-Id: <388b63f5d78146e28fbd1e49ce420eea@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [15/48] git commit: updated refs/heads/1960-paginate-all_dbs to ae4cae9 Docs: Fix doc building under CI Under CI the CouchDB version configured can break the LaTeX PDF building. This patch munges the release name for doc builds. Python styles from Eli Stevens and Alexander Shorin. Closes COUCHDB-2007 Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/f32dae50 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/f32dae50 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/f32dae50 Branch: refs/heads/1960-paginate-all_dbs Commit: f32dae50fde7e20b52bb8399d42e9b0cd3a89b8d Parents: d5f0976 Author: Jan Lehnardt Authored: Thu Dec 19 17:37:22 2013 +0100 Committer: Jan Lehnardt Committed: Thu Dec 19 21:48:49 2013 +0100 ---------------------------------------------------------------------- share/doc/src/conf.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/f32dae50/share/doc/src/conf.py ---------------------------------------------------------------------- diff --git a/share/doc/src/conf.py b/share/doc/src/conf.py index 3d2536e..14a93f5 100644 --- a/share/doc/src/conf.py +++ b/share/doc/src/conf.py @@ -55,7 +55,16 @@ release = '.'.join([ if _info.get('LOCAL_VERSION_RELEASE') == '.%revision%': release += '-dev' elif _info.get('LOCAL_VERSION_RELEASE'): - release += _info['LOCAL_VERSION_STAGE'] + _info['LOCAL_VERSION_RELEASE'] + # jenkins hack, the release name is too long or uses + # characters that cause pain down the road. Example: + # 1.6.0+build.jenkins-ERLANG_VERSION=R14B04,label=Mac-OS-10-8-2-832-76-g2996574 + # which breaks the LaTeX PDF build. Let’s strip this + # down to the git hash at the end. + if 'jenkins' in _info['LOCAL_VERSION_RELEASE']: + release += _info['LOCAL_VERSION_RELEASE'][-9:] + else: # regular case + release += _info['LOCAL_VERSION_STAGE'] + _info['LOCAL_VERSION_RELEASE'] + project = _info['LOCAL_PACKAGE_NAME']