From 40baf82a7b316d127caf287649225a10e2c7e11e Mon Sep 17 00:00:00 2001 From: Jan Pokorný Date: Apr 29 2016 13:24:01 +0000 Subject: [PATCH 1/2] releases: simplify commit message splitting, drop extraneous spaces Signed-off-by: Jan Pokorný --- diff --git a/pagure/templates/releases.html b/pagure/templates/releases.html index 77c41a7..576f5e7 100644 --- a/pagure/templates/releases.html +++ b/pagure/templates/releases.html @@ -42,9 +42,10 @@ {% if tag['objecttype'] == "tag" %} {% if tag['object'].message %} {{tag['tagname']}} - {{ tag['object'].message.split('\n')[0] }} - {% set detailtext = tag['object'].message.partition('\n')[2] %} - {% if detailtext != "" %} + {% set msg_head_tail = tag['object'].message.split('\n', 1) %} + {{ msg_head_tail[0] }} + {% set detailtext = msg_head_tail.pop().strip() %} + {% if msg_head_tail and detailtext %}
{{ detailtext }}
From eb17da9fb8e97979f4539dc0a14350a225d50ca1 Mon Sep 17 00:00:00 2001 From: Jan Pokorný Date: Apr 29 2016 13:47:54 +0000 Subject: [PATCH 2/2] releases: strip GPG signature from tag message if present Signed-off-by: Jan Pokorný --- diff --git a/pagure/templates/releases.html b/pagure/templates/releases.html index 576f5e7..2c68876 100644 --- a/pagure/templates/releases.html +++ b/pagure/templates/releases.html @@ -45,10 +45,13 @@ {% set msg_head_tail = tag['object'].message.split('\n', 1) %} {{ msg_head_tail[0] }} {% set detailtext = msg_head_tail.pop().strip() %} - {% if msg_head_tail and detailtext %} -
- {{ detailtext }} -
+ {% if msg_head_tail and detailtext.endswith('\n-----END PGP SIGNATURE-----') %} + {% set detailtext = detailtext.rsplit('\n-----BEGIN PGP SIGNATURE-----\n', 1)[0] %} + {% if detailtext %} +
+ {{ detailtext }} +
+ {% endif %} {% endif %} {% endif %} {% else %}