From fb7f6cc5be4e6ca2e80f20423ffb9b2a591787fd Mon Sep 17 00:00:00 2001 From: clime Date: Oct 31 2018 19:39:46 +0000 Subject: add patch to support ,priority= appendix for a repo url and interpret it as dnf repo priority --- diff --git a/0001-rpmbuild-support-priority-appendix-for-a-repo-url-an.patch b/0001-rpmbuild-support-priority-appendix-for-a-repo-url-an.patch new file mode 100644 index 0000000..e0a5e94 --- /dev/null +++ b/0001-rpmbuild-support-priority-appendix-for-a-repo-url-an.patch @@ -0,0 +1,30 @@ +From 94a50aabfeed316bc74ea35b38c942fcccf678a8 Mon Sep 17 00:00:00 2001 +From: clime +Date: Wed, 31 Oct 2018 20:24:43 +0100 +Subject: [PATCH] [rpmbuild] support ,priority= appendix for a repo url and + interpret it as dnf repo priority + +--- + rpmbuild/main.py | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/main.py b/main.py +index 22f3e422..cd119f7e 100755 +--- a/main.py ++++ b/main.py +@@ -219,6 +219,12 @@ def get_task(args, config, build_config_url_path=None, task_id=None): + task['repos'] = get_additional_repo_configs( + task['additional_repos'], args.chroot, config.get('main', 'backend_url')) + ++ for i in range(len(task['repos'])): ++ match = re.match('(.*),priority=([0-9]+)$', task['repos'][i]['url']) ++ if match: ++ task['repos'][i]['url'] = match.group(1) ++ task['repos'][i]['priority'] = match.group(2) ++ + return task + + +-- +2.17.0 + diff --git a/copr-rpmbuild.spec b/copr-rpmbuild.spec index dca4a19..d782950 100644 --- a/copr-rpmbuild.spec +++ b/copr-rpmbuild.spec @@ -13,7 +13,7 @@ Name: copr-rpmbuild Version: 0.22 Summary: Run COPR build tasks -Release: 1%{?dist} +Release: 2%{?dist} URL: https://pagure.io/copr/copr License: GPLv2+ BuildArch: noarch @@ -24,6 +24,7 @@ BuildArch: noarch # cd copr/rpmbuild # rpkg spec --sources Source0: copr-rpmbuild-0.22.tar.gz +Patch0: 0001-rpmbuild-support-priority-appendix-for-a-repo-url-an.patch BuildRequires: %python-devel BuildRequires: %rpm_python @@ -67,6 +68,7 @@ build build-id 12345 for chroot epel-7-x86_64. %prep %setup -q +%patch0 -p1 %check PYTHON=%{python} ./run_tests.sh @@ -114,6 +116,10 @@ name="%{name}" version="%{version}" summary="%{summary}" %py_install %config(noreplace) %{_sysconfdir}/copr-rpmbuild/make_srpm_mock.cfg %changelog +* Wed Oct 31 2018 clime 0.22-2 +- add patch to support ,priority= appendix for a repo url and + interpret it as dnf repo priority + * Tue Sep 18 2018 clime 0.22-1 - make spec_template for pypi in build config optional - EPEL6 fixes