From 460e32166102a1ca7a3fc28339644f372d25f4fe Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Fri, 27 Dec 2013 20:02:11 +0000
Subject: [PATCH] Match Gerrit changeid after all other commentlinks
* modules/openstack_project/manifests/gerrit.pp: The changeid
commentlink is greedy, so check it only after the other more
specific commentlinks.
Change-Id: I968d3cbaae94e46ee81c32a9f6f9fdac566d7d40
---
modules/openstack_project/manifests/gerrit.pp | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/modules/openstack_project/manifests/gerrit.pp b/modules/openstack_project/manifests/gerrit.pp
index 26b13b88dd..33e0394c0c 100644
--- a/modules/openstack_project/manifests/gerrit.pp
+++ b/modules/openstack_project/manifests/gerrit.pp
@@ -126,11 +126,6 @@ class openstack_project::gerrit (
httpd_maxthreads => $httpd_maxthreads,
httpd_maxwait => $httpd_maxwait,
commentlinks => [
- {
- name => 'changeid',
- match => '(<p>|[\\s]+)(I?[0-9a-f]{7,40})(</p>|[\\s.]+)',
- html => '$1<a href=\"#q,$2,n,z\">$2</a>$3',
- },
{
name => 'bugheader',
match => '([Cc]loses|[Pp]artial|[Rr]elated)-[Bb]ug:\\s*#?(\\d+)',
@@ -155,7 +150,12 @@ class openstack_project::gerrit (
name => 'launchpadbug',
match => '<a href=\"(https://bugs\\.launchpad\\.net/[a-zA-Z0-9\\-]+/\\+bug/(\\d+))[^\"]+\">[^<]+</a>',
html => '<a href=\"$1\">$1</a>'
- }
+ },
+ {
+ name => 'changeid',
+ match => '(<p>|[\\s]+)(I?[0-9a-f]{7,40})(</p>|[\\s.]+)',
+ html => '$1<a href=\"#q,$2,n,z\">$2</a>$3',
+ },
],
war => $war,
contactstore => $contactstore,