diff --git a/.gitignore b/.gitignore index 068f18f..aec3a7b 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ /module-build-service.spec /module-build-service-1.3.20.tar.gz /module-build-service-1.3.22.tar.gz +/module-build-service-1.3.23.tar.gz diff --git a/mbs-fix-reuse-all.patch b/mbs-fix-reuse-all.patch deleted file mode 100644 index 5e3f6d5..0000000 --- a/mbs-fix-reuse-all.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/module_build_service/scheduler/handlers/modules.py b/module_build_service/scheduler/handlers/modules.py -index 04aeaf9..3d13e30 100644 ---- a/module_build_service/scheduler/handlers/modules.py -+++ b/module_build_service/scheduler/handlers/modules.py -@@ -239,8 +239,10 @@ def wait(config, session, msg): - # If all components in module build will be reused, we don't have to build - # module-build-macros, because there won't be any build done. - if attempt_to_reuse_all_components(builder, session, build): -- log.info("All components have ben reused for module %r, " -+ log.info("All components have been reused for module %r, " - "skipping build" % build) -+ build.transition(config, state="build") -+ session.add(build) - session.commit() - return [] - else: diff --git a/module-build-service.spec b/module-build-service.spec index e4dd1c4..00aceb0 100644 --- a/module-build-service.spec +++ b/module-build-service.spec @@ -1,6 +1,6 @@ Name: module-build-service -Version: 1.3.22 -Release: 3%{?dist} +Version: 1.3.23 +Release: 1%{?dist} Summary: The Module Build Service for Modularity @@ -11,7 +11,6 @@ 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-fix-reuse-all.patch %if 0%{?rhel} && 0%{?rhel} <= 7 # In EL7 we need flask which needs python-itsdangerous which comes from @@ -128,7 +127,6 @@ for a number of tasks: %if 0%{?rhel} && 0%{?rhel} <= 7 %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 @@ -178,6 +176,9 @@ done %changelog +* Wed May 31 2017 Jan Kaluza - 1.3.23-1 +- new version + * Thu May 25 2017 Jan Kaluza - 1.3.22-3 - Use the same spec file for both epel7 and fedora diff --git a/sources b/sources index b9ce51a..fd548b8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (module-build-service-1.3.22.tar.gz) = 3eb4a24d8d1acec1bce5b8b704ecb1663792502c7437ae54ad4ab8b5e49eacc502d580391ec1c8bfe5b657bf78faa903196b29dc6914b0a9fd6536243c6fd91d +SHA512 (module-build-service-1.3.23.tar.gz) = 464e955f6b5848643599120915bcb890d9d09f78865b0c912e70f78459cc495799c31687d40a940106eea18fdef24e2d44bc8d20ffe48c35df8c062ac2c90e4e