From 800f69133128b1f405c07a9faad6ecd098a0a2f3 Mon Sep 17 00:00:00 2001 From: Jan Kaluza Date: Aug 17 2017 12:56:48 +0000 Subject: fix mbs-build issue with trailing slash in REST API url --- diff --git a/mbs-build-trailing-slash.patch b/mbs-build-trailing-slash.patch new file mode 100644 index 0000000..45ba48d --- /dev/null +++ b/mbs-build-trailing-slash.patch @@ -0,0 +1,13 @@ +diff --git a/contrib/mbs-build b/contrib/mbs-build +index 9e4e030..d4d0593 100755 +--- a/contrib/mbs-build ++++ b/contrib/mbs-build +@@ -21,7 +21,7 @@ except ImportError: + + DEFAULT_ID_PROVIDER = "https://id.fedoraproject.org/openidc/" + DEFAULT_MBS_SERVER = "https://mbs.fedoraproject.org" +-DEFAULT_MBS_REST_API = "/module-build-service/1/module-builds" ++DEFAULT_MBS_REST_API = "/module-build-service/1/module-builds/" + DEFAULT_KOJI_TASK_URL = "https://koji.fedoraproject.org/koji/taskinfo" + + openidc_client.WEB_PORTS = [13747] diff --git a/module-build-service.spec b/module-build-service.spec index a931d94..5e117e6 100644 --- a/module-build-service.spec +++ b/module-build-service.spec @@ -1,6 +1,6 @@ Name: module-build-service Version: 1.3.26 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Module Build Service for Modularity @@ -11,6 +11,7 @@ Source0: https://files.pythonhosted.org/packages/source/m/%{name}/%{name}-%{vers %if 0%{?rhel} && 0%{?rhel} <= 7 Patch0: mbs-no-mbsbuild.patch %endif +Patch1: mbs-build-trailing-slash.patch %if 0%{?rhel} && 0%{?rhel} <= 7 # In EL7 we need flask which needs python-itsdangerous which comes from @@ -174,6 +175,8 @@ for a number of tasks: %patch0 -p1 %endif +%patch1 -p1 + # Simply remove an old .pyc file that was included in one release. rm -f module_build_service/scheduler/consumer.pyc # And this weird sqlite file that made it in... @@ -221,8 +224,10 @@ done %exclude %{python2_sitelib}/conf/ %exclude %{python2_sitelib}/tests/ - %changelog +* Thu Aug 17 2017 Jan Kaluza - 1.3.26-2 +- fix mbs-build issue with trailing slash in REST API url + * Thu Aug 17 2017 Jan Kaluza - 1.3.26-1 - new version