Accepting request 722326 from devel:tools:scm

- 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/request/show/722326
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pagure?expand=0&rev=9
This commit is contained in:
Dominique Leuenberger 2019-08-13 11:21:11 +00:00 committed by Git OBS Bridge
commit 17fbcd3199
5 changed files with 16 additions and 58 deletions

View File

@ -1,52 +0,0 @@
From cea8e24f3eb1280c88230981ef624d0f0b9e638c Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
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 <pingou@pingoured.fr>
---
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

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:814841db86fd6199b42a48e636cb920b86f9666148d806a387735f2f327817ba
size 21716088

3
pagure-5.7.4.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8b78c554d7ad0644d35d6bb42cb00fc3ddf8748aecb6253cbc5493eb7492394a
size 21741797

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Sun Aug 11 14:49:11 UTC 2019 - Neal Gompa <ngompa13@gmail.com>
- 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 <ngompa13@gmail.com> Tue Apr 9 12:52:31 UTC 2019 - Neal Gompa <ngompa13@gmail.com>

View File

@ -23,7 +23,7 @@
Name: pagure Name: pagure
Version: 5.5 Version: 5.7.4
Release: 0 Release: 0
Summary: A git-centered forge Summary: A git-centered forge
Group: Development/Tools/Version Control Group: Development/Tools/Version Control
@ -41,8 +41,6 @@ Source1: https://raw.githubusercontent.com/fedora-infra/python-fedora
Source10: pagure-README.SUSE Source10: pagure-README.SUSE
# Backports from upstream # Backports from upstream
## Fix pull mirror service functionality
Patch0001: 0001-Couple-of-fixes-for-the-mirroring-in-feature.patch
# Not yet upstreamable patches # Not yet upstreamable patches
## Allow Pagure to use SQLAlchemy >= 1.3.0 ## Allow Pagure to use SQLAlchemy >= 1.3.0