diff options
| author | Colin Guthrie <colin@mageia.org> | 2014-11-25 09:30:37 +0000 |
|---|---|---|
| committer | Colin Guthrie <colin@mageia.org> | 2014-11-25 09:30:37 +0000 |
| commit | 24694168768a4308f770e7c647c274a642df2500 (patch) | |
| tree | 98aa040eee77dc8226aa1cf223e7d12e1159e1e2 | |
| parent | 9cb1873d02ddfa95a191bc4ac2433a4e67665f7c (diff) | |
| download | puppet-24694168768a4308f770e7c647c274a642df2500.tar puppet-24694168768a4308f770e7c647c274a642df2500.tar.gz puppet-24694168768a4308f770e7c647c274a642df2500.tar.bz2 puppet-24694168768a4308f770e7c647c274a642df2500.tar.xz puppet-24694168768a4308f770e7c647c274a642df2500.zip | |
mgagit,cgit: Use a cosmetically nicer BZ URL
| -rwxr-xr-x | deployment/mgagit/templates/git-post-receive-hook | 2 | ||||
| -rwxr-xr-x | modules/cgit/templates/filter.commit-links.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/deployment/mgagit/templates/git-post-receive-hook b/deployment/mgagit/templates/git-post-receive-hook index 3e2dbae0..e5dc5091 100755 --- a/deployment/mgagit/templates/git-post-receive-hook +++ b/deployment/mgagit/templates/git-post-receive-hook @@ -17,7 +17,7 @@ import urllib2 # When editing this list, remember to edit the same list in # modules/cgit/templates/filter.commit-links.sh BUG_REFS = { - 'Mageia': { 're': re.compile('mga#([0-9]+)'), 'replace': 'https://bugs.mageia.org/show_bug.cgi?id=%s' }, + 'Mageia': { 're': re.compile('mga#([0-9]+)'), 'replace': 'https://bugs.mageia.org/%s' }, 'Red Hat': { 're': re.compile('rhbz#([0-9]+)'), 'replace': 'https://bugzilla.redhat.com/show_bug.cgi?id=%s' }, 'Free Desktop': { 're': re.compile('fdo#([0-9]+)'), 'replace': 'https://bugs.freedesktop.org/show_bug.cgi?id=%s' }, 'KDE': { 're': re.compile('(?:bko|kde)#([0-9]+)'), 'replace': 'https://bugs.kde.org/show_bug.cgi?id=%s' }, diff --git a/modules/cgit/templates/filter.commit-links.sh b/modules/cgit/templates/filter.commit-links.sh index 7c04f95b..f0f7ee14 100755 --- a/modules/cgit/templates/filter.commit-links.sh +++ b/modules/cgit/templates/filter.commit-links.sh @@ -25,7 +25,7 @@ s|\b([0-9a-fA-F]{7,40})\b|<a href="./?id=\1">\1</a>|g' # When editing this list, remember to edit the same list in # deployment/mgagit/templates/git-post-receive-hook regex=$regex' -s|mga#([0-9]+)\b|<a href="https://bugs.mageia.org/show_bug.cgi?id=\1">mga#\1</a>|g' +s|mga#([0-9]+)\b|<a href="https://bugs.mageia.org/\1">mga#\1</a>|g' regex=$regex' s|rhbz#([0-9]+)\b|<a href="https://bugzilla.redhat.com/show_bug.cgi?id=\1">rhbz#\1</a>|g' regex=$regex' |