From 056a4b51e9b3ac9a2069a1129c836a9cfa44729cd92848061b13ee3e8e18de39 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Sun, 11 Aug 2019 14:54:45 +0000 Subject: [PATCH] - Update to 5.7.4 + Add more administrative functions to pagure_admin + Add CSP headers support and a mechanism to customize them + Do not allow rebase via the API if the PR does not allow it + Allow project-less API token to retrieve issues via the API + Improve the support for spec file highlighting - Drop patch that is part of this release + 0001-Couple-of-fixes-for-the-mirroring-in-feature.patch OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm/pagure?expand=0&rev=21 --- ...f-fixes-for-the-mirroring-in-feature.patch | 52 ------------------- pagure-5.5.tar.gz | 3 -- pagure-5.7.4.tar.gz | 3 ++ pagure.changes | 12 +++++ pagure.spec | 4 +- 5 files changed, 16 insertions(+), 58 deletions(-) delete mode 100644 0001-Couple-of-fixes-for-the-mirroring-in-feature.patch delete mode 100644 pagure-5.5.tar.gz create mode 100644 pagure-5.7.4.tar.gz diff --git a/0001-Couple-of-fixes-for-the-mirroring-in-feature.patch b/0001-Couple-of-fixes-for-the-mirroring-in-feature.patch deleted file mode 100644 index fe27134..0000000 --- a/0001-Couple-of-fixes-for-the-mirroring-in-feature.patch +++ /dev/null @@ -1,52 +0,0 @@ -From cea8e24f3eb1280c88230981ef624d0f0b9e638c Mon Sep 17 00:00:00 2001 -From: Pierre-Yves Chibon -Date: Mon, 8 Apr 2019 11:57:21 +0200 -Subject: [PATCH] Couple of fixes for the mirroring-in feature - -This commit does a couple of fixes in the code used for the mirroring-in -feature. -It ensures any exception thrown by pagure.lib.git.mirror_pull_project are -caught and properly logged. Otherwise, the script dies in the middle of -the processing. -It also checks that there is a remote before doing anything and if there -is no remote, it just bails. - -Signed-off-by: Pierre-Yves Chibon ---- - files/mirror_project_in.py | 5 ++++- - pagure/lib/git.py | 3 +++ - 2 files changed, 7 insertions(+), 1 deletion(-) - -diff --git a/files/mirror_project_in.py b/files/mirror_project_in.py -index cfca629b..ba04f2fc 100644 ---- a/files/mirror_project_in.py -+++ b/files/mirror_project_in.py -@@ -34,7 +34,10 @@ def main(check=False, debug=False): - for project in projects: - if debug: - print("Mirrorring %s" % project.fullname) -- pagure.lib.git.mirror_pull_project(session, project, debug=debug) -+ try: -+ pagure.lib.git.mirror_pull_project(session, project, debug=debug) -+ except Exception as err: -+ print("ERROR: %s" % err) - - session.remove() - if debug: -diff --git a/pagure/lib/git.py b/pagure/lib/git.py -index 31253c11..c0e6d023 100644 ---- a/pagure/lib/git.py -+++ b/pagure/lib/git.py -@@ -2846,6 +2846,9 @@ def generate_archive(project, commit, tag, name, archive_fmt): - def mirror_pull_project(session, project, debug=False): - """ Mirror locally a project from a remote URL. """ - remote = project.mirrored_from -+ if not remote: -+ _log.info("No remote found, ignoring") -+ return - repopath = tempfile.mkdtemp(prefix="pagure-mirror_in-") - lclrepopath = pagure.utils.get_repo_path(project) - --- -2.20.1 - diff --git a/pagure-5.5.tar.gz b/pagure-5.5.tar.gz deleted file mode 100644 index 32f1053..0000000 --- a/pagure-5.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:814841db86fd6199b42a48e636cb920b86f9666148d806a387735f2f327817ba -size 21716088 diff --git a/pagure-5.7.4.tar.gz b/pagure-5.7.4.tar.gz new file mode 100644 index 0000000..43f765d --- /dev/null +++ b/pagure-5.7.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8b78c554d7ad0644d35d6bb42cb00fc3ddf8748aecb6253cbc5493eb7492394a +size 21741797 diff --git a/pagure.changes b/pagure.changes index 0f27dc1..bca8af6 100644 --- a/pagure.changes +++ b/pagure.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Sun Aug 11 14:49:11 UTC 2019 - Neal Gompa + +- Update to 5.7.4 + + Add more administrative functions to pagure_admin + + Add CSP headers support and a mechanism to customize them + + Do not allow rebase via the API if the PR does not allow it + + Allow project-less API token to retrieve issues via the API + + Improve the support for spec file highlighting +- Drop patch that is part of this release + + 0001-Couple-of-fixes-for-the-mirroring-in-feature.patch + ------------------------------------------------------------------- Tue Apr 9 12:52:31 UTC 2019 - Neal Gompa diff --git a/pagure.spec b/pagure.spec index b825ebc..235500c 100644 --- a/pagure.spec +++ b/pagure.spec @@ -23,7 +23,7 @@ Name: pagure -Version: 5.5 +Version: 5.7.4 Release: 0 Summary: A git-centered forge Group: Development/Tools/Version Control @@ -41,8 +41,6 @@ Source1: https://raw.githubusercontent.com/fedora-infra/python-fedora Source10: pagure-README.SUSE # Backports from upstream -## Fix pull mirror service functionality -Patch0001: 0001-Couple-of-fixes-for-the-mirroring-in-feature.patch # Not yet upstreamable patches ## Allow Pagure to use SQLAlchemy >= 1.3.0