This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake".
The branch, next has been updated via f34a5aff72c9f233ed45b304b3fa0c602334d55c (commit) via cf66de4ecf12acef547ab70261c63cbdf15b697c (commit) from 3febbf182137717810620bada93239a3a727e5e9 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f34a5aff72c9f233ed45b304b3fa0c602334d55c commit f34a5aff72c9f233ed45b304b3fa0c602334d55c Merge: 3febbf1 cf66de4 Author: Stephen Kelly <steve...@gmail.com> AuthorDate: Mon Mar 31 17:55:00 2014 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Mon Mar 31 17:55:00 2014 -0400 Merge topic 'generate-qch-doc' into next cf66de4e Be robust against the upstream fix. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cf66de4ecf12acef547ab70261c63cbdf15b697c commit cf66de4ecf12acef547ab70261c63cbdf15b697c Author: Stephen Kelly <steve...@gmail.com> AuthorDate: Mon Mar 31 23:52:51 2014 +0200 Commit: Stephen Kelly <steve...@gmail.com> CommitDate: Mon Mar 31 23:52:51 2014 +0200 Be robust against the upstream fix. diff --git a/Utilities/Sphinx/cmake.py b/Utilities/Sphinx/cmake.py index c102990..2d83376 100644 --- a/Utilities/Sphinx/cmake.py +++ b/Utilities/Sphinx/cmake.py @@ -32,7 +32,10 @@ def new_build_keywords(self, title, refs, subitems): for item in old_items: before, rest = item.split("ref=\"", 1) ref, after = rest.split("\"") - new_items.append(before + "ref=\"" + htmlescape(ref) + "\"" + after) + if ("<" in ref and ">" in ref): + new_items.append(before + "ref=\"" + htmlescape(ref) + "\"" + after) + else: + new_items.append(item) return new_items QtHelpBuilder.build_keywords = new_build_keywords ----------------------------------------------------------------------- Summary of changes: Utilities/Sphinx/cmake.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits