diff --git a/roles/copr/backend/files/patches/dont-send-msg-N-times.patch b/roles/copr/backend/files/patches/dont-send-msg-N-times.patch deleted file mode 100644 index c7bfc79400..0000000000 --- a/roles/copr/backend/files/patches/dont-send-msg-N-times.patch +++ /dev/null @@ -1,12 +0,0 @@ -https://pagure.io/fedora-infrastructure/issue/8560 - ---- /usr/share/copr/backend/msgbus.py 2020-01-15 08:23:09.000000000 +0000 -+++ /usr/share/copr/backend/msgbus.py 2020-01-20 09:53:36.100341122 +0000 -@@ -181,6 +181,7 @@ - for attempt in range(1, self.opts.bus_publish_retries + 1): - try: - self._send_message(message) -+ break - except Exception: # pylint: disable=W0703 - # We don't want to halt the worker because of messaging. - self.log.exception("Attempt %s to publish a message failed", attempt) diff --git a/roles/copr/backend/files/patches/fixup-copr-repo-script.patch b/roles/copr/backend/files/patches/fixup-copr-repo-script.patch deleted file mode 100644 index 8f1fe1bb74..0000000000 --- a/roles/copr/backend/files/patches/fixup-copr-repo-script.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- /usr/bin/copr-repo 2020-01-15 08:23:09.000000000 +0000 -+++ /usr/bin/copr-repo 2020-01-17 01:07:57.791459957 +0000 -@@ -148,6 +148,12 @@ - - def add_appdata(opts): - if opts.devel or opts.no_appstream_metadata: -+ opts.log.info("appstream-builder skipped, devel or " -+ "--no-appstream-metadata") -+ return -+ -+ if os.path.exists(os.path.join(opts.projectdir, ".disable-appstream")): -+ opts.log.info("appstream-builder skipped, .disable-appstream file") - return - - path = opts.directory -@@ -199,6 +205,9 @@ - # To avoid race conditions, remove the directories _after_ we have - # successfully generated the new repodata. - for subdir in opts.delete: -+ if not subdir or '..' in subdir: -+ raise Exception("removal of \"%s\" subdir requested", subdir) -+ - opts.log.info("removing %s subdirectory", subdir) - try: - shutil.rmtree(os.path.join(opts.directory, subdir)) -@@ -244,6 +253,7 @@ - def process_directory_path(opts): - helper_path = os.path.abspath(opts.directory) - helper_path, opts.chroot = os.path.split(helper_path) -+ opts.projectdir = helper_path - helper_path, opts.dirname = os.path.split(helper_path) - helper_path, opts.ownername = os.path.split(helper_path) - opts.projectname = opts.dirname.split(':')[0] -@@ -257,6 +267,11 @@ - # try to setup logging based on copr-be.conf - process_backend_config(opts) - -+ # argument parsing -+ if '' in opts.add or '' in opts.delete: -+ opts.log.error("'' dir addition/removal requested") -+ return 1 -+ - # resolve absolute path from opts.directory, and detect - # ownername, dirname, chroot, etc. from it - process_directory_path(opts) diff --git a/roles/copr/backend/tasks/main.yml b/roles/copr/backend/tasks/main.yml index 391f58e16a..2216756426 100644 --- a/roles/copr/backend/tasks/main.yml +++ b/roles/copr/backend/tasks/main.yml @@ -34,16 +34,6 @@ # dest=/usr/bin/prunerepo # tags: patches -- name: issue 1213 - patch: src=patches/fixup-copr-repo-script.patch - dest=/usr/bin/copr-repo - tags: patches - -- name: patch for https://pagure.io/fedora-infrastructure/issue/8560 - patch: src=patches/dont-send-msg-N-times.patch - dest=/usr/share/copr/backend/msgbus.py - tags: patches - - name: install openstackclient for image preparation dnf: state=present name=python3-openstackclient when: devel|bool