mirror of
https://src.fedoraproject.org/rpms/module-build-service.git
synced 2026-11-03 14:43:44 +08:00
Update to v1.4.1
This commit is contained in:
@@ -1,67 +0,0 @@
|
||||
From 089a0c3db4d4191a508b058eaac0b0e9b1593d17 Mon Sep 17 00:00:00 2001
|
||||
From: mprahl <mprahl@redhat.com>
|
||||
Date: Thu, 2 Nov 2017 08:37:59 -0400
|
||||
Subject: [PATCH] Fix typo
|
||||
|
||||
---
|
||||
module_build_service/config.py | 2 +-
|
||||
module_build_service/models.py | 2 +-
|
||||
module_build_service/views.py | 2 +-
|
||||
tests/test_views/test_views.py | 2 +-
|
||||
4 files changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/module_build_service/config.py b/module_build_service/config.py
|
||||
index b51cb18..ce89c72 100644
|
||||
--- a/module_build_service/config.py
|
||||
+++ b/module_build_service/config.py
|
||||
@@ -586,7 +586,7 @@ class Config(object):
|
||||
|
||||
def _setifok_rebuild_strategy(self, strategy):
|
||||
if strategy not in SUPPORTED_STRATEGIES:
|
||||
- raise ValueError('The strategy "{0}" is not supported. Chose from: {1}'
|
||||
+ raise ValueError('The strategy "{0}" is not supported. Choose from: {1}'
|
||||
.format(strategy, ', '.join(SUPPORTED_STRATEGIES)))
|
||||
self._rebuild_strategy = strategy
|
||||
|
||||
diff --git a/module_build_service/models.py b/module_build_service/models.py
|
||||
index 7941905..80854bd 100644
|
||||
--- a/module_build_service/models.py
|
||||
+++ b/module_build_service/models.py
|
||||
@@ -233,7 +233,7 @@ class ModuleBuild(MBSBase):
|
||||
def validate_rebuild_stategy(self, key, rebuild_strategy):
|
||||
if rebuild_strategy not in self.rebuild_strategies.keys():
|
||||
choices = ', '.join(self.rebuild_strategies.keys())
|
||||
- raise ValueError('The rebuild_strategy of "{0}" is invalid. Chose from: {1}'
|
||||
+ raise ValueError('The rebuild_strategy of "{0}" is invalid. Choose from: {1}'
|
||||
.format(rebuild_strategy, choices))
|
||||
return rebuild_strategy
|
||||
|
||||
diff --git a/module_build_service/views.py b/module_build_service/views.py
|
||||
index a99a096..8b97060 100644
|
||||
--- a/module_build_service/views.py
|
||||
+++ b/module_build_service/views.py
|
||||
@@ -267,7 +267,7 @@ class BaseHandler(object):
|
||||
if 'rebuild_strategy' in self.data:
|
||||
if self.data['rebuild_strategy'] not in conf.rebuild_strategies_allowed:
|
||||
raise ValidationError(
|
||||
- 'The rebuild method of "{0}" is not allowed. Chose from: {1}.'
|
||||
+ 'The rebuild method of "{0}" is not allowed. Choose from: {1}.'
|
||||
.format(self.data['rebuild_strategy'],
|
||||
', '.join(conf.rebuild_strategies_allowed)))
|
||||
|
||||
diff --git a/tests/test_views/test_views.py b/tests/test_views/test_views.py
|
||||
index c2bb643..80850c8 100644
|
||||
--- a/tests/test_views/test_views.py
|
||||
+++ b/tests/test_views/test_views.py
|
||||
@@ -538,7 +538,7 @@ class TestViews(unittest.TestCase):
|
||||
self.assertEqual(rv.status_code, 400)
|
||||
expected_error = {
|
||||
'error': 'Bad Request',
|
||||
- 'message': ('The rebuild method of "only-changed" is not allowed. Chose from: all.'),
|
||||
+ 'message': ('The rebuild method of "only-changed" is not allowed. Choose from: all.'),
|
||||
'status': 400
|
||||
}
|
||||
self.assertEqual(data, expected_error)
|
||||
--
|
||||
2.13.6
|
||||
|
||||
@@ -1,17 +1,16 @@
|
||||
Name: module-build-service
|
||||
Version: 1.4.0
|
||||
Release: 2%{?dist}
|
||||
Version: 1.4.1
|
||||
Release: 1%{?dist}
|
||||
Summary: The Module Build Service for Modularity
|
||||
|
||||
Group: Development/Tools
|
||||
License: MIT
|
||||
URL: https://pagure.io/fm-orchestrator
|
||||
Source0: https://files.pythonhosted.org/packages/source/m/%{name}/%{name}-%{version}.tar.gz
|
||||
Patch0: fix-typo.patch
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
%if 0%{?rhel} && 0%{?rhel} <= 7
|
||||
%if 0%{?rhel}
|
||||
ExclusiveArch: %{ix86} x86_64 noarch
|
||||
%endif
|
||||
|
||||
@@ -166,7 +165,6 @@ for a number of tasks:
|
||||
%prep
|
||||
%setup -q
|
||||
|
||||
%patch0 -p1
|
||||
|
||||
# Simply remove an old .pyc file that was included in one release.
|
||||
rm -f module_build_service/scheduler/consumer.pyc
|
||||
@@ -216,6 +214,9 @@ done
|
||||
%exclude %{python2_sitelib}/tests/
|
||||
|
||||
%changelog
|
||||
* Thu Nov 2 2017 Matt Prahl <mprahl@redhat.com> - 1.4.1.1
|
||||
- New version
|
||||
|
||||
* Thu Nov 2 2017 Matt Prahl <mprahl@redhat.com> - 1.4.0-2
|
||||
- Remove the caching patch that was merged upstream
|
||||
- Add a patch that fixes a typo in error messages
|
||||
|
||||
Reference in New Issue
Block a user