From 477e814cd81c605c59b5bc1ee38f5de49a2c812a Mon Sep 17 00:00:00 2001 From: Kevin Morris Date: Tue, 8 Feb 2022 09:27:06 -0800 Subject: [PATCH 01/11] change: set git-cliff's output format to asciidoc style we'll be using git-cliff to produce changelogs for new tags from now on. we want to include these changelogs within the tag body without markdown. Signed-off-by: Kevin Morris --- cliff.toml | 43 ++++++++----------------------------------- 1 file changed, 8 insertions(+), 35 deletions(-) diff --git a/cliff.toml b/cliff.toml index 6ee495a3..173beefc 100644 --- a/cliff.toml +++ b/cliff.toml @@ -2,52 +2,25 @@ [changelog] # changelog header -header = """ -# Changelog -All notable feature additions, bug fixes and changes to this project will be \ -documented in this file.\n -""" +header = "" # template for the changelog body # https://tera.netlify.app/docs/#introduction body = """ {% if version %}\ - #### Release [{{ version | trim_start_matches(pat="v") }}] - {{ timestamp | date(format="%Y-%m-%d") }} -{% else %}\ - {% set head = commits | last %}\ - | Branch | HEAD | Status | Coverage | - |--------|------|--------|----------| - | [pu](https://gitlab.archlinux.org/archlinux/aurweb/-/tree/pu) | [{{ head.id | truncate(length=8, end="") }}](https://gitlab.archlinux.org/archlinux/aurweb/-/commits/{{ head.id }}) | ![pipeline](https://gitlab.archlinux.org/archlinux/aurweb/badges/pu/pipeline.svg?key_text=build) | ![coverage](https://gitlab.archlinux.org/archlinux/aurweb/badges/pu/coverage.svg) | +Release {{ version }} - {{ timestamp | date(format="%Y-%m-%d") }} +--------------------------- {% endif %}\ {% for group, commits in commits | group_by(attribute="group") %} - ### {{ group | lower }} - | Commit | Message | - |--------|---------| \ - {% for commit in commits %} - | [{{ commit.id | truncate(length=8, end="") }}](https://gitlab.archlinux.org/archlinux/aurweb/-/commit/{{ commit.id }}) | {{ commit.message }} |\ - {% endfor %} +{{ group | lower }}:\ +{% for commit in commits %} +- {{ commit.id | truncate(length=8, end="") }} - {{ commit.message }}\ +{% endfor %} {% endfor %}\n """ # remove the leading and trailing whitespaces from the template trim = true # changelog footer -footer = """ -## Notes - -See a general project status overview at \ -https://gitlab.archlinux.org/archlinux/aurweb/-/wikis/Home. - -To contribute with testing of the modern aurweb FastAPI port development, visit \ -https://gitlab.archlinux.org/archlinux/aurweb/-/wikis/Testing-Guide. - -To file a bug, create an issue using the Bug template by following the link: \ -https://gitlab.archlinux.org/archlinux/aurweb/-/issues/new?issuable_template=Bug. - -To provide feedback, create an issue using the Feedback template by following -the link: \ -https://gitlab.archlinux.org/archlinux/aurweb/-/issues/new?issuable_template=Feedback. - - -""" +footer = "" [git] # allow only conventional commits From a21c48afe7f48bd87a18ebe21cc1cd119a67f74c Mon Sep 17 00:00:00 2001 From: Kevin Morris Date: Tue, 8 Feb 2022 09:32:46 -0800 Subject: [PATCH 02/11] change: format git-cliff commit hashes a bit better Use a ':' instead of a '-' to separate commit hash from message Signed-off-by: Kevin Morris --- cliff.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cliff.toml b/cliff.toml index 173beefc..bc09935b 100644 --- a/cliff.toml +++ b/cliff.toml @@ -13,7 +13,7 @@ Release {{ version }} - {{ timestamp | date(format="%Y-%m-%d") }} {% for group, commits in commits | group_by(attribute="group") %} {{ group | lower }}:\ {% for commit in commits %} -- {{ commit.id | truncate(length=8, end="") }} - {{ commit.message }}\ +- {{ commit.id | truncate(length=8, end="") }}: {{ commit.message }}\ {% endfor %} {% endfor %}\n """ From 310484a8cc0c2c728aa11e234668697ccbefc191 Mon Sep 17 00:00:00 2001 From: Kevin Morris Date: Tue, 8 Feb 2022 09:39:14 -0800 Subject: [PATCH 03/11] change: display git-cliff's commit scope Signed-off-by: Kevin Morris --- cliff.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cliff.toml b/cliff.toml index bc09935b..4d65fd3a 100644 --- a/cliff.toml +++ b/cliff.toml @@ -13,7 +13,7 @@ Release {{ version }} - {{ timestamp | date(format="%Y-%m-%d") }} {% for group, commits in commits | group_by(attribute="group") %} {{ group | lower }}:\ {% for commit in commits %} -- {{ commit.id | truncate(length=8, end="") }}: {{ commit.message }}\ +- {{ commit.id | truncate(length=8, end="") }}: {% if commit.scope %}({{ commit.scope }}) {% endif %}{{ commit.message }}\ {% endfor %} {% endfor %}\n """ From bf0623d8c76d0ccfc5e516b4fe235ec69bd15f5c Mon Sep 17 00:00:00 2001 From: Kevin Morris Date: Tue, 8 Feb 2022 09:43:07 -0800 Subject: [PATCH 04/11] change(git-cliff): include a header for untagged cliffs Signed-off-by: Kevin Morris --- cliff.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cliff.toml b/cliff.toml index 4d65fd3a..fba14d28 100644 --- a/cliff.toml +++ b/cliff.toml @@ -9,6 +9,9 @@ body = """ {% if version %}\ Release {{ version }} - {{ timestamp | date(format="%Y-%m-%d") }} --------------------------- +{% else %}\ +Changelog (untagged) +--------------------------- {% endif %}\ {% for group, commits in commits | group_by(attribute="group") %} {{ group | lower }}:\ From d79d7bdd1e74907580fb7c5b5b6d22533b783c2e Mon Sep 17 00:00:00 2001 From: Leonidas Spyropoulos Date: Tue, 8 Feb 2022 17:51:07 +0000 Subject: [PATCH 05/11] docs: update issues url to gitlab Signed-off-by: Leonidas Spyropoulos --- README.md | 2 +- po/Makefile | 2 +- po/ar.po | 2 +- po/ast.po | 2 +- po/aurweb.pot | 2 +- po/az.po | 2 +- po/az_AZ.po | 2 +- po/bg.po | 2 +- po/ca.po | 2 +- po/ca_ES.po | 2 +- po/cs.po | 2 +- po/da.po | 2 +- po/de.po | 2 +- po/el.po | 2 +- po/es.po | 2 +- po/es_419.po | 2 +- po/et.po | 2 +- po/fi.po | 2 +- po/fi_FI.po | 2 +- po/fr.po | 2 +- po/he.po | 2 +- po/hi_IN.po | 2 +- po/hr.po | 2 +- po/hu.po | 2 +- po/id.po | 2 +- po/id_ID.po | 2 +- po/is.po | 2 +- po/it.po | 2 +- po/ja.po | 2 +- po/ko.po | 2 +- po/lt.po | 2 +- po/nb.po | 2 +- po/nb_NO.po | 2 +- po/nl.po | 2 +- po/pl.po | 2 +- po/pt.po | 2 +- po/pt_BR.po | 2 +- po/pt_PT.po | 2 +- po/ro.po | 2 +- po/ru.po | 2 +- po/sk.po | 2 +- po/sr.po | 2 +- po/sr_RS.po | 2 +- po/sv_SE.po | 2 +- po/tr.po | 2 +- po/uk.po | 2 +- po/vi.po | 2 +- po/zh.po | 2 +- po/zh_CN.po | 2 +- po/zh_TW.po | 2 +- templates/home.html | 2 +- templates/partials/footer.html | 1 + 52 files changed, 52 insertions(+), 51 deletions(-) diff --git a/README.md b/README.md index 8ebefe13..3f156455 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ Links -- see doc/CodingGuidelines for information on the patch submission process. * Bugs can (and should) be submitted to the aurweb bug tracker: - https://bugs.archlinux.org/index.php?project=2 + https://gitlab.archlinux.org/archlinux/aurweb/-/issues/new?issuable_template=Bug * Questions, comments, and patches related to aurweb can be sent to the AUR development mailing list: aur-dev@archlinux.org -- mailing list archives: diff --git a/po/Makefile b/po/Makefile index 57fa9f77..0b579f48 100644 --- a/po/Makefile +++ b/po/Makefile @@ -37,7 +37,7 @@ LOCALES = ${MOFILES:.mo=} UPDATEPOFILES = ${POFILES:.po=.po-update} -MSGID_BUGS_ADDRESS = https://bugs.archlinux.org/index.php?project=2 +MSGID_BUGS_ADDRESS = https://gitlab.archlinux.org/archlinux/aurweb/-/issues all: ${MOFILES} diff --git a/po/ar.po b/po/ar.po index 676a5025..ecc8b08f 100644 --- a/po/ar.po +++ b/po/ar.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" +"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/ast.po b/po/ast.po index 16c363a6..b23057af 100644 --- a/po/ast.po +++ b/po/ast.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" +"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2020-03-07 17:55+0000\n" "Last-Translator: enolp \n" diff --git a/po/aurweb.pot b/po/aurweb.pot index afad9e12..bec1b672 100644 --- a/po/aurweb.pot +++ b/po/aurweb.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: AURWEB v4.8.0\n" -"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" +"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" diff --git a/po/az.po b/po/az.po index 7e534b4c..d426872c 100644 --- a/po/az.po +++ b/po/az.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" +"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/az_AZ.po b/po/az_AZ.po index e903027b..9fd3b5bb 100644 --- a/po/az_AZ.po +++ b/po/az_AZ.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" +"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/bg.po b/po/bg.po index 7864f5dc..2ceab947 100644 --- a/po/bg.po +++ b/po/bg.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" +"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/ca.po b/po/ca.po index 391dd146..accd18a0 100644 --- a/po/ca.po +++ b/po/ca.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" +"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/ca_ES.po b/po/ca_ES.po index bad69bd1..ba6c0050 100644 --- a/po/ca_ES.po +++ b/po/ca_ES.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" +"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/cs.po b/po/cs.po index b9bd739a..8b44d97a 100644 --- a/po/cs.po +++ b/po/cs.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" +"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/da.po b/po/da.po index a6f290ea..84c6a5b8 100644 --- a/po/da.po +++ b/po/da.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" +"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/de.po b/po/de.po index ec0a0fbe..07d043ef 100644 --- a/po/de.po +++ b/po/de.po @@ -27,7 +27,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" +"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/el.po b/po/el.po index f1fe704e..9851d597 100644 --- a/po/el.po +++ b/po/el.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" +"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/es.po b/po/es.po index ea7ac099..690680f7 100644 --- a/po/es.po +++ b/po/es.po @@ -18,7 +18,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" +"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/es_419.po b/po/es_419.po index 444eccb7..47c0a835 100644 --- a/po/es_419.po +++ b/po/es_419.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" +"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2020-01-31 08:29+0000\n" "Last-Translator: Lukas Fleischer\n" diff --git a/po/et.po b/po/et.po index 9b6493b5..f59aa904 100644 --- a/po/et.po +++ b/po/et.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" +"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/fi.po b/po/fi.po index 39cfe626..8cc7fed2 100644 --- a/po/fi.po +++ b/po/fi.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" +"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/fi_FI.po b/po/fi_FI.po index f3253433..6fbcb185 100644 --- a/po/fi_FI.po +++ b/po/fi_FI.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" +"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/fr.po b/po/fr.po index 99d01460..95809e1d 100644 --- a/po/fr.po +++ b/po/fr.po @@ -18,7 +18,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" +"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/he.po b/po/he.po index cd4a0f87..93efb44f 100644 --- a/po/he.po +++ b/po/he.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" +"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/hi_IN.po b/po/hi_IN.po index 37fd082e..6b7b52eb 100644 --- a/po/hi_IN.po +++ b/po/hi_IN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" +"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/hr.po b/po/hr.po index 4932bd7e..d5b69098 100644 --- a/po/hr.po +++ b/po/hr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" +"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/hu.po b/po/hu.po index 51894457..da1d40a6 100644 --- a/po/hu.po +++ b/po/hu.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" +"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/id.po b/po/id.po index 75a6c98b..16e9a988 100644 --- a/po/id.po +++ b/po/id.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" +"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/id_ID.po b/po/id_ID.po index d01294c8..e50efff9 100644 --- a/po/id_ID.po +++ b/po/id_ID.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" +"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/is.po b/po/is.po index a7a88b04..19320cee 100644 --- a/po/is.po +++ b/po/is.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" +"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/it.po b/po/it.po index 436b6459..d72396d3 100644 --- a/po/it.po +++ b/po/it.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" +"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/ja.po b/po/ja.po index 55d056bf..9ee6116c 100644 --- a/po/ja.po +++ b/po/ja.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" +"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/ko.po b/po/ko.po index 808ffe27..96382f8b 100644 --- a/po/ko.po +++ b/po/ko.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" +"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/lt.po b/po/lt.po index d126f193..6cb4d946 100644 --- a/po/lt.po +++ b/po/lt.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" +"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/nb.po b/po/nb.po index 1cc090f1..e1fa16a0 100644 --- a/po/nb.po +++ b/po/nb.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" +"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/nb_NO.po b/po/nb_NO.po index 74af6936..dd909957 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" +"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/nl.po b/po/nl.po index 282b5b40..3e7c546e 100644 --- a/po/nl.po +++ b/po/nl.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" +"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/pl.po b/po/pl.po index 4856f22b..0a52d7cc 100644 --- a/po/pl.po +++ b/po/pl.po @@ -19,7 +19,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" +"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/pt.po b/po/pt.po index b2cf86b2..b226ba87 100644 --- a/po/pt.po +++ b/po/pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" +"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/pt_BR.po b/po/pt_BR.po index c9c15d72..c9deeff7 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" +"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/pt_PT.po b/po/pt_PT.po index 3518cb7b..d0ed790e 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" +"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/ro.po b/po/ro.po index fa159928..79826396 100644 --- a/po/ro.po +++ b/po/ro.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" +"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/ru.po b/po/ru.po index 75550c8c..7f6efe0f 100644 --- a/po/ru.po +++ b/po/ru.po @@ -18,7 +18,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" +"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/sk.po b/po/sk.po index 76d3d1a8..1ea42448 100644 --- a/po/sk.po +++ b/po/sk.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" +"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/sr.po b/po/sr.po index dae37bcd..2cc46b04 100644 --- a/po/sr.po +++ b/po/sr.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" +"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/sr_RS.po b/po/sr_RS.po index 985ee007..d075b589 100644 --- a/po/sr_RS.po +++ b/po/sr_RS.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" +"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/sv_SE.po b/po/sv_SE.po index 6d09e207..24f8bf57 100644 --- a/po/sv_SE.po +++ b/po/sv_SE.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" +"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/tr.po b/po/tr.po index 83b1e4df..9e10ec96 100644 --- a/po/tr.po +++ b/po/tr.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" +"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/uk.po b/po/uk.po index a4410185..4b369615 100644 --- a/po/uk.po +++ b/po/uk.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" +"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/vi.po b/po/vi.po index 3ea5bad3..23ed265d 100644 --- a/po/vi.po +++ b/po/vi.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" +"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/zh.po b/po/zh.po index 04fe06f3..02bba19a 100644 --- a/po/zh.po +++ b/po/zh.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" +"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/zh_CN.po b/po/zh_CN.po index 53d42bc8..ecc37bb9 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -17,7 +17,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" +"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/zh_TW.po b/po/zh_TW.po index e7399a19..a9611e6f 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" +"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/templates/home.html b/templates/home.html index a8cae5b8..c1f172f4 100644 --- a/templates/home.html +++ b/templates/home.html @@ -83,7 +83,7 @@

{{ "If you find a bug in the AUR web interface, please fill out a bug report on our %sbug tracker%s. Use the tracker to report bugs in the AUR web interface %sonly%s. To report packaging bugs contact the package maintainer or leave a comment on the appropriate package page." | tr - | format('', "", + | format('', "", "", "") | safe }} diff --git a/templates/partials/footer.html b/templates/partials/footer.html index 3103699f..d88c3eb8 100644 --- a/templates/partials/footer.html +++ b/templates/partials/footer.html @@ -12,6 +12,7 @@ {% endif %} {% endif %}

+

Report issues here.

Copyright © 2004-{{ now.strftime("%Y") }} aurweb Development Team.

{% trans %}AUR packages are user produced content. Any use of the provided files is at your own risk.{% endtrans %}

From acc888584437140adc79e4791692a87470f4ef9d Mon Sep 17 00:00:00 2001 From: Leonidas Spyropoulos Date: Tue, 8 Feb 2022 18:40:38 +0000 Subject: [PATCH 06/11] docs: revert changes from *.po These will be done automatically from next transifex pull Signed-off-by: Leonidas Spyropoulos --- po/ar.po | 2 +- po/ast.po | 2 +- po/az.po | 2 +- po/az_AZ.po | 2 +- po/bg.po | 2 +- po/ca.po | 2 +- po/ca_ES.po | 2 +- po/cs.po | 2 +- po/da.po | 2 +- po/de.po | 2 +- po/el.po | 2 +- po/es.po | 2 +- po/es_419.po | 2 +- po/et.po | 2 +- po/fi.po | 2 +- po/fi_FI.po | 2 +- po/fr.po | 2 +- po/he.po | 2 +- po/hi_IN.po | 2 +- po/hr.po | 2 +- po/hu.po | 2 +- po/id.po | 2 +- po/id_ID.po | 2 +- po/is.po | 2 +- po/it.po | 2 +- po/ja.po | 2 +- po/ko.po | 2 +- po/lt.po | 2 +- po/nb.po | 2 +- po/nb_NO.po | 2 +- po/nl.po | 2 +- po/pl.po | 2 +- po/pt.po | 2 +- po/pt_BR.po | 2 +- po/pt_PT.po | 2 +- po/ro.po | 2 +- po/ru.po | 2 +- po/sk.po | 2 +- po/sr.po | 2 +- po/sr_RS.po | 2 +- po/sv_SE.po | 2 +- po/tr.po | 2 +- po/uk.po | 2 +- po/vi.po | 2 +- po/zh.po | 2 +- po/zh_CN.po | 2 +- po/zh_TW.po | 2 +- 47 files changed, 47 insertions(+), 47 deletions(-) diff --git a/po/ar.po b/po/ar.po index ecc8b08f..676a5025 100644 --- a/po/ar.po +++ b/po/ar.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" +"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/ast.po b/po/ast.po index b23057af..16c363a6 100644 --- a/po/ast.po +++ b/po/ast.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" +"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2020-03-07 17:55+0000\n" "Last-Translator: enolp \n" diff --git a/po/az.po b/po/az.po index d426872c..7e534b4c 100644 --- a/po/az.po +++ b/po/az.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" +"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/az_AZ.po b/po/az_AZ.po index 9fd3b5bb..e903027b 100644 --- a/po/az_AZ.po +++ b/po/az_AZ.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" +"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/bg.po b/po/bg.po index 2ceab947..7864f5dc 100644 --- a/po/bg.po +++ b/po/bg.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" +"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/ca.po b/po/ca.po index accd18a0..391dd146 100644 --- a/po/ca.po +++ b/po/ca.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" +"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/ca_ES.po b/po/ca_ES.po index ba6c0050..bad69bd1 100644 --- a/po/ca_ES.po +++ b/po/ca_ES.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" +"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/cs.po b/po/cs.po index 8b44d97a..b9bd739a 100644 --- a/po/cs.po +++ b/po/cs.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" +"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/da.po b/po/da.po index 84c6a5b8..a6f290ea 100644 --- a/po/da.po +++ b/po/da.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" +"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/de.po b/po/de.po index 07d043ef..ec0a0fbe 100644 --- a/po/de.po +++ b/po/de.po @@ -27,7 +27,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" +"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/el.po b/po/el.po index 9851d597..f1fe704e 100644 --- a/po/el.po +++ b/po/el.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" +"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/es.po b/po/es.po index 690680f7..ea7ac099 100644 --- a/po/es.po +++ b/po/es.po @@ -18,7 +18,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" +"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/es_419.po b/po/es_419.po index 47c0a835..444eccb7 100644 --- a/po/es_419.po +++ b/po/es_419.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" +"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2020-01-31 08:29+0000\n" "Last-Translator: Lukas Fleischer\n" diff --git a/po/et.po b/po/et.po index f59aa904..9b6493b5 100644 --- a/po/et.po +++ b/po/et.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" +"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/fi.po b/po/fi.po index 8cc7fed2..39cfe626 100644 --- a/po/fi.po +++ b/po/fi.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" +"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/fi_FI.po b/po/fi_FI.po index 6fbcb185..f3253433 100644 --- a/po/fi_FI.po +++ b/po/fi_FI.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" +"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/fr.po b/po/fr.po index 95809e1d..99d01460 100644 --- a/po/fr.po +++ b/po/fr.po @@ -18,7 +18,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" +"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/he.po b/po/he.po index 93efb44f..cd4a0f87 100644 --- a/po/he.po +++ b/po/he.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" +"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/hi_IN.po b/po/hi_IN.po index 6b7b52eb..37fd082e 100644 --- a/po/hi_IN.po +++ b/po/hi_IN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" +"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/hr.po b/po/hr.po index d5b69098..4932bd7e 100644 --- a/po/hr.po +++ b/po/hr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" +"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/hu.po b/po/hu.po index da1d40a6..51894457 100644 --- a/po/hu.po +++ b/po/hu.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" +"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/id.po b/po/id.po index 16e9a988..75a6c98b 100644 --- a/po/id.po +++ b/po/id.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" +"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/id_ID.po b/po/id_ID.po index e50efff9..d01294c8 100644 --- a/po/id_ID.po +++ b/po/id_ID.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" +"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/is.po b/po/is.po index 19320cee..a7a88b04 100644 --- a/po/is.po +++ b/po/is.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" +"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/it.po b/po/it.po index d72396d3..436b6459 100644 --- a/po/it.po +++ b/po/it.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" +"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/ja.po b/po/ja.po index 9ee6116c..55d056bf 100644 --- a/po/ja.po +++ b/po/ja.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" +"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/ko.po b/po/ko.po index 96382f8b..808ffe27 100644 --- a/po/ko.po +++ b/po/ko.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" +"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/lt.po b/po/lt.po index 6cb4d946..d126f193 100644 --- a/po/lt.po +++ b/po/lt.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" +"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/nb.po b/po/nb.po index e1fa16a0..1cc090f1 100644 --- a/po/nb.po +++ b/po/nb.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" +"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/nb_NO.po b/po/nb_NO.po index dd909957..74af6936 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" +"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/nl.po b/po/nl.po index 3e7c546e..282b5b40 100644 --- a/po/nl.po +++ b/po/nl.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" +"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/pl.po b/po/pl.po index 0a52d7cc..4856f22b 100644 --- a/po/pl.po +++ b/po/pl.po @@ -19,7 +19,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" +"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/pt.po b/po/pt.po index b226ba87..b2cf86b2 100644 --- a/po/pt.po +++ b/po/pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" +"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/pt_BR.po b/po/pt_BR.po index c9deeff7..c9c15d72 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" +"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/pt_PT.po b/po/pt_PT.po index d0ed790e..3518cb7b 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" +"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/ro.po b/po/ro.po index 79826396..fa159928 100644 --- a/po/ro.po +++ b/po/ro.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" +"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/ru.po b/po/ru.po index 7f6efe0f..75550c8c 100644 --- a/po/ru.po +++ b/po/ru.po @@ -18,7 +18,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" +"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/sk.po b/po/sk.po index 1ea42448..76d3d1a8 100644 --- a/po/sk.po +++ b/po/sk.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" +"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/sr.po b/po/sr.po index 2cc46b04..dae37bcd 100644 --- a/po/sr.po +++ b/po/sr.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" +"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/sr_RS.po b/po/sr_RS.po index d075b589..985ee007 100644 --- a/po/sr_RS.po +++ b/po/sr_RS.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" +"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/sv_SE.po b/po/sv_SE.po index 24f8bf57..6d09e207 100644 --- a/po/sv_SE.po +++ b/po/sv_SE.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" +"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/tr.po b/po/tr.po index 9e10ec96..83b1e4df 100644 --- a/po/tr.po +++ b/po/tr.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" +"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/uk.po b/po/uk.po index 4b369615..a4410185 100644 --- a/po/uk.po +++ b/po/uk.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" +"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/vi.po b/po/vi.po index 23ed265d..3ea5bad3 100644 --- a/po/vi.po +++ b/po/vi.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" +"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/zh.po b/po/zh.po index 02bba19a..04fe06f3 100644 --- a/po/zh.po +++ b/po/zh.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" +"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/zh_CN.po b/po/zh_CN.po index ecc37bb9..53d42bc8 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -17,7 +17,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" +"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" diff --git a/po/zh_TW.po b/po/zh_TW.po index a9611e6f..e7399a19 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: aurweb\n" -"Report-Msgid-Bugs-To: https://gitlab.archlinux.org/archlinux/aurweb/-/issues\n" +"Report-Msgid-Bugs-To: https://bugs.archlinux.org/index.php?project=2\n" "POT-Creation-Date: 2020-01-31 09:29+0100\n" "PO-Revision-Date: 2022-01-18 17:18+0000\n" "Last-Translator: Kevin Morris \n" From 40a0e866e79398c5d5469128fae93781ef85e4d8 Mon Sep 17 00:00:00 2001 From: Kevin Morris Date: Mon, 7 Feb 2022 01:42:37 -0800 Subject: [PATCH 07/11] feat(archives): add {archive}.sha256 and construct archives in tmpdir This change brings some new additions to our archives: - SHA-256 .sha256 hexdigests - We construct our archives in a tmpdir now and move them to the archive destination when all are completed. This removes some corrupted downloading when archiving is in-process. Signed-off-by: Kevin Morris --- aurweb/routers/html.py | 13 ++++++ aurweb/scripts/mkpkglists.py | 64 +++++++++++++++++++++------ doc/maintenance.txt | 5 ++- docker-compose.yml | 1 + test/test_html.py | 30 ++++++++++++- test/test_mkpkglists.py | 83 +++++++++++++++++------------------- 6 files changed, 135 insertions(+), 61 deletions(-) diff --git a/aurweb/routers/html.py b/aurweb/routers/html.py index 52e3f818..8d32089a 100644 --- a/aurweb/routers/html.py +++ b/aurweb/routers/html.py @@ -213,6 +213,19 @@ async def index(request: Request): return render_template(request, "index.html", context) +@router.get("/{archive}.sha256") +async def archive_sha256(request: Request, archive: str): + archivedir = aurweb.config.get("mkpkglists", "archivedir") + hashfile = os.path.join(archivedir, f"{archive}.sha256") + if not os.path.exists(hashfile): + raise HTTPException(status_code=HTTPStatus.NOT_FOUND) + + with open(hashfile) as f: + hash_value = f.read() + headers = {"Content-Type": "text/plain"} + return Response(hash_value, headers=headers) + + @router.get("/metrics") async def metrics(request: Request): registry = CollectorRegistry() diff --git a/aurweb/scripts/mkpkglists.py b/aurweb/scripts/mkpkglists.py index dd2e9e86..e27e4399 100755 --- a/aurweb/scripts/mkpkglists.py +++ b/aurweb/scripts/mkpkglists.py @@ -20,9 +20,13 @@ on the following, right-hand side fields are added to each item. import gzip import os +import re +import shutil import sys +import tempfile from collections import defaultdict +from subprocess import PIPE, Popen from typing import Any, Dict import orjson @@ -37,15 +41,6 @@ from aurweb.models import Package, PackageBase, User logger = logging.get_logger("aurweb.scripts.mkpkglists") -archivedir = aurweb.config.get("mkpkglists", "archivedir") -os.makedirs(archivedir, exist_ok=True) - -PACKAGES = aurweb.config.get('mkpkglists', 'packagesfile') -META = aurweb.config.get('mkpkglists', 'packagesmetafile') -META_EXT = aurweb.config.get('mkpkglists', 'packagesmetaextfile') -PKGBASE = aurweb.config.get('mkpkglists', 'pkgbasefile') -USERS = aurweb.config.get('mkpkglists', 'userfile') - TYPE_MAP = { "depends": "Depends", @@ -175,6 +170,15 @@ def as_dict(package: Package) -> Dict[str, Any]: def _main(): + archivedir = aurweb.config.get("mkpkglists", "archivedir") + os.makedirs(archivedir, exist_ok=True) + + PACKAGES = aurweb.config.get('mkpkglists', 'packagesfile') + META = aurweb.config.get('mkpkglists', 'packagesmetafile') + META_EXT = aurweb.config.get('mkpkglists', 'packagesmetaextfile') + PKGBASE = aurweb.config.get('mkpkglists', 'pkgbasefile') + USERS = aurweb.config.get('mkpkglists', 'userfile') + bench = Benchmark() logger.info("Started re-creating archives, wait a while...") @@ -204,9 +208,14 @@ def _main(): # Produce packages-meta-v1.json.gz output = list() snapshot_uri = aurweb.config.get("options", "snapshot_uri") + + tmpdir = tempfile.mkdtemp() + tmp_packages = os.path.join(tmpdir, os.path.basename(PACKAGES)) + tmp_meta = os.path.join(tmpdir, os.path.basename(META)) + tmp_metaext = os.path.join(tmpdir, os.path.basename(META_EXT)) gzips = { - "packages": gzip.open(PACKAGES, "wt"), - "meta": gzip.open(META, "wb"), + "packages": gzip.open(tmp_packages, "wt"), + "meta": gzip.open(tmp_meta, "wb"), } # Append list opening to the metafile. @@ -215,7 +224,7 @@ def _main(): # Produce packages.gz + packages-meta-ext-v1.json.gz extended = False if len(sys.argv) > 1 and sys.argv[1] in EXTENDED_FIELD_HANDLERS: - gzips["meta_ext"] = gzip.open(META_EXT, "wb") + gzips["meta_ext"] = gzip.open(tmp_metaext, "wb") # Append list opening to the meta_ext file. gzips.get("meta_ext").write(b"[\n") f = EXTENDED_FIELD_HANDLERS.get(sys.argv[1]) @@ -258,14 +267,41 @@ def _main(): # Produce pkgbase.gz query = db.query(PackageBase.Name).filter( PackageBase.PackagerUID.isnot(None)).all() - with gzip.open(PKGBASE, "wt") as f: + tmp_pkgbase = os.path.join(tmpdir, os.path.basename(PKGBASE)) + with gzip.open(tmp_pkgbase, "wt") as f: f.writelines([f"{base.Name}\n" for i, base in enumerate(query)]) # Produce users.gz query = db.query(User.Username).all() - with gzip.open(USERS, "wt") as f: + tmp_users = os.path.join(tmpdir, os.path.basename(USERS)) + with gzip.open(tmp_users, "wt") as f: f.writelines([f"{user.Username}\n" for i, user in enumerate(query)]) + files = [ + (tmp_packages, PACKAGES), + (tmp_meta, META), + (tmp_pkgbase, PKGBASE), + (tmp_users, USERS), + ] + if len(sys.argv) > 1 and sys.argv[1] in EXTENDED_FIELD_HANDLERS: + files.append((tmp_metaext, META_EXT)) + + for src, dst in files: + proc = Popen(["cksum", "-a", "sha256", src], stdout=PIPE) + out, _ = proc.communicate() + assert proc.returncode == 0 + + base = os.path.basename(src) + checksum = re.sub(r"SHA256 \(.+\)", f"SHA256 ({base})", out.decode()) + + checksum_file = f"{dst}.sha256" + with open(checksum_file, "w") as f: + f.write(checksum) + + # Move the new archive into its rightful place. + shutil.move(src, dst) + + os.removedirs(tmpdir) seconds = filters.number_format(bench.end(), 4) logger.info(f"Completed in {seconds} seconds.") diff --git a/doc/maintenance.txt b/doc/maintenance.txt index fbde1fff..c52cf76f 100644 --- a/doc/maintenance.txt +++ b/doc/maintenance.txt @@ -71,7 +71,10 @@ computations and clean up the database: within the last 24 hours but never populated. * aurweb-mkpkglists generates the package list files; it takes an optional - --extended flag, which additionally produces multiinfo metadata. + --extended flag, which additionally produces multiinfo metadata. It also + generates {archive.gz}.sha256 files that should be located within + mkpkglists.archivedir which contain a SHA-256 hash of their matching + .gz counterpart. * aurweb-usermaint removes the last login IP address of all users that did not login within the past seven days. diff --git a/docker-compose.yml b/docker-compose.yml index 5046e89a..a56cbe72 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -237,6 +237,7 @@ services: cron: condition: service_started volumes: + - archives:/var/lib/aurweb/archives - mariadb_run:/var/run/mysqld ports: - "127.0.0.1:18000:8000" diff --git a/test/test_html.py b/test/test_html.py index df018a03..25834987 100644 --- a/test/test_html.py +++ b/test/test_html.py @@ -1,5 +1,10 @@ """ A test suite used to test HTML renders in different cases. """ +import hashlib +import os +import tempfile + from http import HTTPStatus +from unittest import mock import fastapi import pytest @@ -7,7 +12,7 @@ import pytest from fastapi import HTTPException from fastapi.testclient import TestClient -from aurweb import asgi, db +from aurweb import asgi, config, db from aurweb.models import PackageBase from aurweb.models.account_type import TRUSTED_USER_ID, USER_ID from aurweb.models.user import User @@ -125,6 +130,29 @@ def test_get_successes(): assert successes[0].text.strip() == "Test" +def test_archive_sig(client: TestClient): + hash_value = hashlib.sha256(b'test').hexdigest() + + with tempfile.TemporaryDirectory() as tmpdir: + packages_sha256 = os.path.join(tmpdir, "packages.gz.sha256") + with open(packages_sha256, "w") as f: + f.write(hash_value) + + config_get = config.get + + def mock_config(section: str, key: str): + if key == "archivedir": + return tmpdir + return config_get(section, key) + + with mock.patch("aurweb.config.get", side_effect=mock_config): + with client as request: + resp = request.get("/packages.gz.sha256") + + assert resp.status_code == int(HTTPStatus.OK) + assert resp.text == hash_value + + def test_metrics(client: TestClient): with client as request: resp = request.get("/metrics") diff --git a/test/test_mkpkglists.py b/test/test_mkpkglists.py index ee66e4e1..4a98ba81 100644 --- a/test/test_mkpkglists.py +++ b/test/test_mkpkglists.py @@ -3,6 +3,7 @@ import json from typing import List, Union from unittest import mock +import py import pytest from aurweb import config, db, util @@ -14,14 +15,18 @@ from aurweb.testing import noop class FakeFile: data = str() - __exit__ = noop - def __init__(self, modes: str) -> "FakeFile": + def __init__(self, archive: str, modes: str) -> "FakeFile": + self.archive = archive self.modes = modes def __enter__(self, *args, **kwargs) -> "FakeFile": return self + def __exit__(self, *args, **kwargs): + print(f"Writing {self.archive}....") + self.close() + def write(self, data: Union[str, bytes]) -> None: if isinstance(data, bytes): data = data.decode() @@ -31,7 +36,8 @@ class FakeFile: util.apply_all(dataset, self.write) def close(self) -> None: - return + with open(self.archive, "w") as f: + f.write(self.data) class MockGzipOpen: @@ -39,7 +45,7 @@ class MockGzipOpen: self.gzips = dict() def open(self, archive: str, modes: str): - self.gzips[archive] = FakeFile(modes) + self.gzips[archive] = FakeFile(archive, modes) return self.gzips.get(archive) def get(self, key: str) -> FakeFile: @@ -49,6 +55,7 @@ class MockGzipOpen: return self.get(key) def __contains__(self, key: str) -> bool: + print(self.gzips.keys()) return key in self.gzips def data(self, archive: str): @@ -95,49 +102,35 @@ def packages(user: User) -> List[Package]: yield sorted(output, key=lambda k: k.Name) -@mock.patch("os.makedirs", side_effect=noop) -def test_mkpkglists_empty(makedirs: mock.MagicMock): - gzips = MockGzipOpen() - with mock.patch("gzip.open", side_effect=gzips.open): - from aurweb.scripts import mkpkglists - mkpkglists.main() +@pytest.fixture +def config_mock(tmpdir: py.path.local) -> None: + config_get = config.get + archivedir = config.get("mkpkglists", "archivedir") - archives = config.get_section("mkpkglists") - archives.pop("archivedir") - archives.pop("packagesmetaextfile") + def mock_config(section: str, key: str) -> str: + if section == "mkpkglists": + if key == "archivedir": + return str(tmpdir) + return config_get(section, key).replace(archivedir, str(tmpdir)) + return config_get(section, key) - for archive in archives.values(): - assert archive in gzips + with mock.patch("aurweb.config.get", side_effect=mock_config): + config.rehash() + yield + config.rehash() - # Expect that packagesfile got created, but is empty because - # we have no DB records. - packages_file = archives.get("packagesfile") - assert gzips.data(packages_file) == str() - # Expect that pkgbasefile got created, but is empty because - # we have no DB records. - users_file = archives.get("pkgbasefile") - assert gzips.data(users_file) == str() - - # Expect that userfile got created, but is empty because - # we have no DB records. - users_file = archives.get("userfile") - assert gzips.data(users_file) == str() - - # Expect that packagesmetafile got created, but is empty because - # we have no DB records; it's still a valid empty JSON list. - meta_file = archives.get("packagesmetafile") - assert gzips.data(meta_file) == "[\n]" +def test_mkpkglists(tmpdir: py.path.local, config_mock: None): + from aurweb.scripts import mkpkglists + mkpkglists.main() @mock.patch("sys.argv", ["mkpkglists", "--extended"]) -@mock.patch("os.makedirs", side_effect=noop) -def test_mkpkglists_extended_empty(makedirs: mock.MagicMock): - gzips = MockGzipOpen() - with mock.patch("gzip.open", side_effect=gzips.open): - from aurweb.scripts import mkpkglists - mkpkglists.main() +def test_mkpkglists_extended_empty(config_mock: None): + from aurweb.scripts import mkpkglists + mkpkglists.main() + ''' archives = config.get_section("mkpkglists") archives.pop("archivedir") @@ -168,17 +161,16 @@ def test_mkpkglists_extended_empty(makedirs: mock.MagicMock): # we have no DB records; it's still a valid empty JSON list. meta_file = archives.get("packagesmetaextfile") assert gzips.data(meta_file) == "[\n]" + ''' @mock.patch("sys.argv", ["mkpkglists", "--extended"]) -@mock.patch("os.makedirs", side_effect=noop) -def test_mkpkglists_extended(makedirs: mock.MagicMock, user: User, +def test_mkpkglists_extended(config_mock: None, user: User, packages: List[Package]): - gzips = MockGzipOpen() - with mock.patch("gzip.open", side_effect=gzips.open): - from aurweb.scripts import mkpkglists - mkpkglists.main() + from aurweb.scripts import mkpkglists + mkpkglists.main() + ''' archives = config.get_section("mkpkglists") archives.pop("archivedir") @@ -213,3 +205,4 @@ def test_mkpkglists_extended(makedirs: mock.MagicMock, user: User, meta_file = archives.get("packagesmetaextfile") data = json.loads(gzips.data(meta_file)) assert len(data) == 5 + ''' From b119db251b2d1088f7b75419f3ff5b070e434bd1 Mon Sep 17 00:00:00 2001 From: Awal Garg Date: Wed, 9 Feb 2022 06:38:02 +0530 Subject: [PATCH 08/11] fixup: feat(archives): add .sha256 and construct archives in tmpdir --- aurweb/scripts/mkpkglists.py | 21 ++-- test/test_mkpkglists.py | 238 +++++++++++++++++++---------------- 2 files changed, 140 insertions(+), 119 deletions(-) diff --git a/aurweb/scripts/mkpkglists.py b/aurweb/scripts/mkpkglists.py index e27e4399..00096d74 100755 --- a/aurweb/scripts/mkpkglists.py +++ b/aurweb/scripts/mkpkglists.py @@ -19,14 +19,14 @@ on the following, right-hand side fields are added to each item. """ import gzip +import hashlib +import io import os -import re import shutil import sys import tempfile from collections import defaultdict -from subprocess import PIPE, Popen from typing import Any, Dict import orjson @@ -169,6 +169,14 @@ def as_dict(package: Package) -> Dict[str, Any]: } +def sha256sum(file_path: str) -> str: + hash = hashlib.sha256() + with open(file_path, "rb") as f: + while chunk := f.read(io.DEFAULT_BUFFER_SIZE): + hash.update(chunk) + return hash.hexdigest() + + def _main(): archivedir = aurweb.config.get("mkpkglists", "archivedir") os.makedirs(archivedir, exist_ok=True) @@ -287,16 +295,13 @@ def _main(): files.append((tmp_metaext, META_EXT)) for src, dst in files: - proc = Popen(["cksum", "-a", "sha256", src], stdout=PIPE) - out, _ = proc.communicate() - assert proc.returncode == 0 - + checksum = sha256sum(src) base = os.path.basename(src) - checksum = re.sub(r"SHA256 \(.+\)", f"SHA256 ({base})", out.decode()) + checksum_formatted = f"SHA256 ({base}) = {checksum}" checksum_file = f"{dst}.sha256" with open(checksum_file, "w") as f: - f.write(checksum) + f.write(checksum_formatted) # Move the new archive into its rightful place. shutil.move(src, dst) diff --git a/test/test_mkpkglists.py b/test/test_mkpkglists.py index 4a98ba81..7b538e02 100644 --- a/test/test_mkpkglists.py +++ b/test/test_mkpkglists.py @@ -1,65 +1,34 @@ +import gzip import json +import os -from typing import List, Union +from typing import List from unittest import mock import py import pytest -from aurweb import config, db, util +from aurweb import config, db from aurweb.models import License, Package, PackageBase, PackageDependency, PackageLicense, User from aurweb.models.account_type import USER_ID from aurweb.models.dependency_type import DEPENDS_ID -from aurweb.testing import noop - -class FakeFile: - data = str() - - def __init__(self, archive: str, modes: str) -> "FakeFile": - self.archive = archive - self.modes = modes - - def __enter__(self, *args, **kwargs) -> "FakeFile": - return self - - def __exit__(self, *args, **kwargs): - print(f"Writing {self.archive}....") - self.close() - - def write(self, data: Union[str, bytes]) -> None: - if isinstance(data, bytes): - data = data.decode() - self.data += data - - def writelines(self, dataset: List[Union[str, bytes]]) -> None: - util.apply_all(dataset, self.write) - - def close(self) -> None: - with open(self.archive, "w") as f: - f.write(self.data) - - -class MockGzipOpen: - def __init__(self): - self.gzips = dict() - - def open(self, archive: str, modes: str): - self.gzips[archive] = FakeFile(archive, modes) - return self.gzips.get(archive) - - def get(self, key: str) -> FakeFile: - return self.gzips.get(key) - - def __getitem__(self, key: str) -> FakeFile: - return self.get(key) - - def __contains__(self, key: str) -> bool: - print(self.gzips.keys()) - return key in self.gzips - - def data(self, archive: str): - return self.get(archive).data +META_KEYS = [ + "ID", + "Name", + "PackageBaseID", + "PackageBase", + "Version", + "Description", + "URL", + "NumVotes", + "Popularity", + "OutOfDate", + "Maintainer", + "FirstSubmitted", + "LastModified", + "URLPath", +] @pytest.fixture(autouse=True) @@ -120,48 +89,81 @@ def config_mock(tmpdir: py.path.local) -> None: config.rehash() -def test_mkpkglists(tmpdir: py.path.local, config_mock: None): +def test_mkpkglists(tmpdir: py.path.local, config_mock: None, user: User, packages: List[Package]): from aurweb.scripts import mkpkglists mkpkglists.main() + PACKAGES = config.get("mkpkglists", "packagesfile") + META = config.get("mkpkglists", "packagesmetafile") + PKGBASE = config.get("mkpkglists", "pkgbasefile") + USERS = config.get("mkpkglists", "userfile") + + expectations = [ + ( + PACKAGES, + "pkg_0\npkg_1\npkg_2\npkg_3\npkg_4\n", + ), + ( + PKGBASE, + "pkgbase_0\npkgbase_1\npkgbase_2\npkgbase_3\npkgbase_4\n", + ), + ( + USERS, + "test\n" + ), + ] + + for (file, expected_content) in expectations: + with gzip.open(file, "r") as f: + file_content = f.read().decode() + assert file_content == expected_content + + with gzip.open(META) as f: + metadata = json.load(f) + + assert len(metadata) == len(packages) + for pkg in metadata: + for key in META_KEYS: + assert key in pkg, f"{pkg=} record does not have {key=}" + + for file in (PACKAGES, PKGBASE, USERS, META): + with open(f"{file}.sha256") as f: + file_sig_content = f.read() + expected_prefix = f"SHA256 ({os.path.basename(file)}) = " + assert file_sig_content.startswith(expected_prefix) + assert len(file_sig_content) == len(expected_prefix) + 64 + @mock.patch("sys.argv", ["mkpkglists", "--extended"]) def test_mkpkglists_extended_empty(config_mock: None): from aurweb.scripts import mkpkglists mkpkglists.main() - ''' - archives = config.get_section("mkpkglists") - archives.pop("archivedir") + PACKAGES = config.get("mkpkglists", "packagesfile") + META = config.get("mkpkglists", "packagesmetafile") + META_EXT = config.get("mkpkglists", "packagesmetaextfile") + PKGBASE = config.get("mkpkglists", "pkgbasefile") + USERS = config.get("mkpkglists", "userfile") - for archive in archives.values(): - assert archive in gzips + expectations = [ + (PACKAGES, ""), + (PKGBASE, ""), + (USERS, ""), + (META, "[\n]"), + (META_EXT, "[\n]"), + ] - # Expect that packagesfile got created, but is empty because - # we have no DB records. - packages_file = archives.get("packagesfile") - assert gzips.data(packages_file) == str() + for (file, expected_content) in expectations: + with gzip.open(file, "r") as f: + file_content = f.read().decode() + assert file_content == expected_content, f"{file=} contents malformed" - # Expect that pkgbasefile got created, but is empty because - # we have no DB records. - users_file = archives.get("pkgbasefile") - assert gzips.data(users_file) == str() - - # Expect that userfile got created, but is empty because - # we have no DB records. - users_file = archives.get("userfile") - assert gzips.data(users_file) == str() - - # Expect that packagesmetafile got created, but is empty because - # we have no DB records; it's still a valid empty JSON list. - meta_file = archives.get("packagesmetafile") - assert gzips.data(meta_file) == "[\n]" - - # Expect that packagesmetafile got created, but is empty because - # we have no DB records; it's still a valid empty JSON list. - meta_file = archives.get("packagesmetaextfile") - assert gzips.data(meta_file) == "[\n]" - ''' + for file in (PACKAGES, PKGBASE, USERS, META, META_EXT): + with open(f"{file}.sha256") as f: + file_sig_content = f.read() + expected_prefix = f"SHA256 ({os.path.basename(file)}) = " + assert file_sig_content.startswith(expected_prefix) + assert len(file_sig_content) == len(expected_prefix) + 64 @mock.patch("sys.argv", ["mkpkglists", "--extended"]) @@ -170,39 +172,53 @@ def test_mkpkglists_extended(config_mock: None, user: User, from aurweb.scripts import mkpkglists mkpkglists.main() - ''' - archives = config.get_section("mkpkglists") - archives.pop("archivedir") + PACKAGES = config.get("mkpkglists", "packagesfile") + META = config.get("mkpkglists", "packagesmetafile") + META_EXT = config.get("mkpkglists", "packagesmetaextfile") + PKGBASE = config.get("mkpkglists", "pkgbasefile") + USERS = config.get("mkpkglists", "userfile") - for archive in archives.values(): - assert archive in gzips + expectations = [ + ( + PACKAGES, + "pkg_0\npkg_1\npkg_2\npkg_3\npkg_4\n", + ), + ( + PKGBASE, + "pkgbase_0\npkgbase_1\npkgbase_2\npkgbase_3\npkgbase_4\n", + ), + ( + USERS, + "test\n" + ), + ] - # Expect that packagesfile got created, but is empty because - # we have no DB records. - packages_file = archives.get("packagesfile") - expected = "\n".join([p.Name for p in packages]) + "\n" - assert gzips.data(packages_file) == expected + for (file, expected_content) in expectations: + with gzip.open(file, "r") as f: + file_content = f.read().decode() + assert file_content == expected_content - # Expect that pkgbasefile got created, but is empty because - # we have no DB records. - users_file = archives.get("pkgbasefile") - expected = "\n".join([p.PackageBase.Name for p in packages]) + "\n" - assert gzips.data(users_file) == expected + with gzip.open(META) as f: + metadata = json.load(f) - # Expect that userfile got created, but is empty because - # we have no DB records. - users_file = archives.get("userfile") - assert gzips.data(users_file) == "test\n" + assert len(metadata) == len(packages) + for pkg in metadata: + for key in META_KEYS: + assert key in pkg, f"{pkg=} record does not have {key=}" - # Expect that packagesmetafile got created, but is empty because - # we have no DB records; it's still a valid empty JSON list. - meta_file = archives.get("packagesmetafile") - data = json.loads(gzips.data(meta_file)) - assert len(data) == 5 + with gzip.open(META_EXT) as f: + extended_metadata = json.load(f) - # Expect that packagesmetafile got created, but is empty because - # we have no DB records; it's still a valid empty JSON list. - meta_file = archives.get("packagesmetaextfile") - data = json.loads(gzips.data(meta_file)) - assert len(data) == 5 - ''' + assert len(extended_metadata) == len(packages) + for pkg in extended_metadata: + for key in META_KEYS: + assert key in pkg, f"{pkg=} record does not have {key=}" + assert isinstance(pkg["Depends"], list) + assert isinstance(pkg["License"], list) + + for file in (PACKAGES, PKGBASE, USERS, META, META_EXT): + with open(f"{file}.sha256") as f: + file_sig_content = f.read() + expected_prefix = f"SHA256 ({os.path.basename(file)}) = " + assert file_sig_content.startswith(expected_prefix) + assert len(file_sig_content) == len(expected_prefix) + 64 From 4ae72af4b527d2580684b36a247356b4c5695ebf Mon Sep 17 00:00:00 2001 From: Kevin Morris Date: Tue, 8 Feb 2022 17:58:43 -0800 Subject: [PATCH 09/11] fix: address missing coverage from previous changes Signed-off-by: Kevin Morris --- aurweb/testing/__init__.py | 4 ---- test/test_html.py | 6 ++++++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/aurweb/testing/__init__.py b/aurweb/testing/__init__.py index 99671d69..8261051d 100644 --- a/aurweb/testing/__init__.py +++ b/aurweb/testing/__init__.py @@ -62,7 +62,3 @@ def setup_test_db(*args): aurweb.db.get_session().execute(f"DELETE FROM {table}") aurweb.db.get_session().execute("SET FOREIGN_KEY_CHECKS = 1") aurweb.db.get_session().expunge_all() - - -def noop(*args, **kwargs) -> None: - return diff --git a/test/test_html.py b/test/test_html.py index 25834987..b97d3571 100644 --- a/test/test_html.py +++ b/test/test_html.py @@ -153,6 +153,12 @@ def test_archive_sig(client: TestClient): assert resp.text == hash_value +def test_archive_sig_404(client: TestClient): + with client as request: + resp = request.get("/blah.gz.sha256") + assert resp.status_code == int(HTTPStatus.NOT_FOUND) + + def test_metrics(client: TestClient): with client as request: resp = request.get("/metrics") From 2cb53411c0a3640063b935a3f5fc060d4eca7c9b Mon Sep 17 00:00:00 2001 From: Kevin Morris Date: Tue, 8 Feb 2022 20:02:14 -0800 Subject: [PATCH 10/11] change: remove comaintainers when fulfilling orphan request Closes FS#50079 Signed-off-by: Kevin Morris --- aurweb/pkgbase/actions.py | 1 + test/test_requests.py | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/aurweb/pkgbase/actions.py b/aurweb/pkgbase/actions.py index 73366829..229d52b9 100644 --- a/aurweb/pkgbase/actions.py +++ b/aurweb/pkgbase/actions.py @@ -71,6 +71,7 @@ def pkgbase_disown_instance(request: Request, pkgbase: PackageBase) -> None: notifs += handle_request(request, ORPHAN_ID, pkgbase) with db.begin(): pkgbase.Maintainer = None + db.delete_all(pkgbase.comaintainers) util.apply_all(notifs, lambda n: n.send()) diff --git a/test/test_requests.py b/test/test_requests.py index 113368f0..5ac558e0 100644 --- a/test/test_requests.py +++ b/test/test_requests.py @@ -12,6 +12,7 @@ from fastapi.testclient import TestClient from aurweb import asgi, config, db, defaults, time from aurweb.models import Package, PackageBase, PackageRequest, User from aurweb.models.account_type import TRUSTED_USER_ID, USER_ID +from aurweb.models.package_comaintainer import PackageComaintainer from aurweb.models.package_notification import PackageNotification from aurweb.models.package_request import ACCEPTED_ID, PENDING_ID, REJECTED_ID from aurweb.models.request_type import DELETION_ID, MERGE_ID, ORPHAN_ID @@ -501,6 +502,11 @@ def test_merge_autorequest(client: TestClient, user: User, tu_user: User, def test_orphan_request(client: TestClient, user: User, tu_user: User, pkgbase: PackageBase, pkgreq: PackageRequest): """ Test the standard orphan request route. """ + user2 = create_user("user2", "user2@example.org") + with db.begin(): + db.create(PackageComaintainer, User=user2, + PackageBase=pkgbase, Priority=1) + idle_time = config.getint("options", "request_idle_time") now = time.utcnow() with db.begin(): @@ -516,6 +522,12 @@ def test_orphan_request(client: TestClient, user: User, tu_user: User, assert resp.status_code == int(HTTPStatus.SEE_OTHER) assert resp.headers.get("location") == f"/pkgbase/{pkgbase.Name}" + # We should have unset the maintainer. + assert pkgbase.Maintainer is None + + # We should have removed the comaintainers. + assert not pkgbase.comaintainers.all() + # Ensure that `pkgreq`.ClosureComment was left alone when specified. assert pkgreq.ClosureComment == comments From c883c710538455481c72e1ece1b918989c896a57 Mon Sep 17 00:00:00 2001 From: Kevin Morris Date: Tue, 8 Feb 2022 20:14:52 -0800 Subject: [PATCH 11/11] upgrade: bump to v6.0.9 Signed-off-by: Kevin Morris --- aurweb/config.py | 2 +- pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/aurweb/config.py b/aurweb/config.py index 4d54e788..728f4b11 100644 --- a/aurweb/config.py +++ b/aurweb/config.py @@ -6,7 +6,7 @@ from typing import Any # Publicly visible version of aurweb. This is used to display # aurweb versioning in the footer and must be maintained. # Todo: Make this dynamic/automated. -AURWEB_VERSION = "v6.0.8" +AURWEB_VERSION = "v6.0.9" _parser = None diff --git a/pyproject.toml b/pyproject.toml index 11d4402e..8c7ede9b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,7 +8,7 @@ # [tool.poetry] name = "aurweb" -version = "v6.0.8" +version = "v6.0.9" license = "GPL-2.0-only" description = "Source code for the Arch User Repository's website" homepage = "https://aur.archlinux.org"