From 66d99fdad227e85fad3dd003b3f0850d4dab6c36 Mon Sep 17 00:00:00 2001 From: Jan Kaluza Date: Jun 27 2017 13:16:15 +0000 Subject: new version --- diff --git a/.gitignore b/.gitignore index aec3a7b..29618f9 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ /module-build-service-1.3.20.tar.gz /module-build-service-1.3.22.tar.gz /module-build-service-1.3.23.tar.gz +/module-build-service-1.3.24.tar.gz diff --git a/mbs-koji-find-untagged.patch b/mbs-koji-find-untagged.patch index 778d16d..39e9c79 100644 --- a/mbs-koji-find-untagged.patch +++ b/mbs-koji-find-untagged.patch @@ -1,3 +1,11 @@ +From 0a8efdc2e54a1df534425bef6460de0eb5c4fb7f Mon Sep 17 00:00:00 2001 +From: Jan Kaluza +Date: Jun 05 2017 11:48:36 +0000 +Subject: Tag the component to final tag in case it is built, but not tagged. + + +--- + diff --git a/module_build_service/builder/KojiModuleBuilder.py b/module_build_service/builder/KojiModuleBuilder.py index eede0ab..382d2ea 100644 --- a/module_build_service/builder/KojiModuleBuilder.py @@ -62,16 +70,17 @@ index eede0ab..382d2ea 100644 log.info("skipping build of %s. Build already exists (task_id=%s), via %s" % ( source, task_info['task_id'], self)) diff --git a/module_build_service/scheduler/handlers/modules.py b/module_build_service/scheduler/handlers/modules.py -index 849bc07..7580d94 100644 +index a48df6b..cc94b73 100644 --- a/module_build_service/scheduler/handlers/modules.py +++ b/module_build_service/scheduler/handlers/modules.py -@@ -29,12 +29,12 @@ import module_build_service.pdc +@@ -29,13 +29,13 @@ import module_build_service.pdc import module_build_service.utils import module_build_service.messaging from module_build_service.utils import ( - start_next_batch_build, attempt_to_reuse_all_components) + start_next_batch_build, attempt_to_reuse_all_components, + get_rpm_release_from_mmd) + from module_build_service.builder.KojiContentGenerator import KojiContentGenerator from requests.exceptions import ConnectionError @@ -80,7 +89,7 @@ index 849bc07..7580d94 100644 import logging import os -@@ -42,15 +42,6 @@ import os +@@ -43,15 +43,6 @@ import os logging.basicConfig(level=logging.DEBUG) @@ -97,7 +106,7 @@ index 849bc07..7580d94 100644 return os.path.basename(srpm_path).replace(".src.rpm", "") diff --git a/module_build_service/utils.py b/module_build_service/utils.py -index 99ca4cc..f3aecc5 100644 +index a47b080..dba95c5 100644 --- a/module_build_service/utils.py +++ b/module_build_service/utils.py @@ -33,6 +33,7 @@ import copy @@ -121,3 +130,4 @@ index 99ca4cc..f3aecc5 100644 + dist_str = '.'.join([mmd.name, mmd.stream, str(mmd.version)]) + dist_hash = hashlib.sha1(dist_str).hexdigest()[:8] + return conf.default_dist_tag_prefix + dist_hash + diff --git a/module-build-service.spec b/module-build-service.spec index 7d69f9a..9c704fe 100644 --- a/module-build-service.spec +++ b/module-build-service.spec @@ -1,6 +1,6 @@ Name: module-build-service -Version: 1.3.23 -Release: 5%{?dist} +Version: 1.3.24 +Release: 1%{?dist} Summary: The Module Build Service for Modularity @@ -12,7 +12,6 @@ Source0: https://files.pythonhosted.org/packages/source/m/%{name}/%{name}-%{vers Patch0: mbs-no-mbsbuild.patch %endif Patch1: mbs-koji-find-untagged.patch -Patch2: mbs-reuse.patch %if 0%{?rhel} && 0%{?rhel} <= 7 # In EL7 we need flask which needs python-itsdangerous which comes from @@ -131,7 +130,6 @@ for a number of tasks: %endif %patch1 -p1 -%patch2 -p1 # Simply remove an old .pyc file that was included in one release. rm -f module_build_service/scheduler/consumer.pyc @@ -181,6 +179,9 @@ done %changelog +* Tue Jul 27 2017 Jan Kaluza - 1.3.24-1 +- new version + * Mon Jun 05 2017 Jan Kaluza - 1.3.23-5 - Fix the components reuse if database returns them in different order diff --git a/sources b/sources index fd548b8..d7e1943 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (module-build-service-1.3.23.tar.gz) = 464e955f6b5848643599120915bcb890d9d09f78865b0c912e70f78459cc495799c31687d40a940106eea18fdef24e2d44bc8d20ffe48c35df8c062ac2c90e4e +SHA512 (module-build-service-1.3.24.tar.gz) = 4fb3a1d6235893071be7a04c74941fabf1067fc8ada235756154f60ca145a668929a5528d0c0a1f00682407eb58ddbc080a954bd5ce1ff48a7950fe95ed3e44f