starlingx/upstream
Code Issues Proposed changes

de-fuzz python-wsme patches

Browse Source 
When do Centos 7.5 upgraded, some patches didn't resolve and cause
the fuzzy in the line numbers of the patches. And it may cause
.orig file is created when do patch. And this .orig file will lead
to rpm packaging failure due to the unexpected and unpackaged .orig
file.

Please visit below link to get more detail info:
https://bugs.launchpad.net/starlingx/+bug/1794611

Solution:
  Safest solution is to de-fuzz our patches.

Story: 2003389
Task: 26755

Change-Id: Iad4c16a87e3f41c310368ace2a57ea7692f10070
Signed-off-by: slin14 <shuicheng.lin@intel.com>
This commit is contained in:
slin14 2018-09-28 08:05:17 +08:00
parent f77c2e1146
commit 454c23b0e1
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
openstack/python-wsme/centos/meta_patches/0003-Remove-TOX-calls-from-build.patch
View File

@ -1,17 +1,17 @@
From 8e5e778228717039e39be1fb65c63a6fe7c3cd5d Mon Sep 17 00:00:00 2001 From 6aa8e5b13954e7b2ef2ffe619c8818db4a109f6b Mon Sep 17 00:00:00 2001
From: Al Bailey <Al.Bailey@windriver.com> From: Al Bailey <Al.Bailey@windriver.com>
Date: Tue, 6 Mar 2018 09:56:17 -0600 Date: Tue, 6 Mar 2018 09:56:17 -0600
Subject: [PATCH] Remove TOX calls from build Subject: Remove TOX calls from build
--- ---
SPECS/python-wsme.spec | 6 ------ SPECS/python-wsme.spec | 6 ------
1 file changed, 6 deletions(-) 1 file changed, 6 deletions(-)
diff --git a/SPECS/python-wsme.spec b/SPECS/python-wsme.spec diff --git a/SPECS/python-wsme.spec b/SPECS/python-wsme.spec
index 4a2c360..602bff0 100644 index c778f97..403c331 100644
--- a/SPECS/python-wsme.spec --- a/SPECS/python-wsme.spec
+++ b/SPECS/python-wsme.spec +++ b/SPECS/python-wsme.spec
@@ -106,12 +106,6 @@ manipulate the request and the response objects. @@ -102,12 +102,6 @@ manipulate the request and the response objects.
%{__python3} setup.py install --skip-build --root %{buildroot} %{__python3} setup.py install --skip-build --root %{buildroot}
%endif %endif
@ -25,5 +25,5 @@ index 4a2c360..602bff0 100644
%doc README.rst examples/ %doc README.rst examples/
%license LICENSE %license LICENSE
-- --
1.8.3.1 2.7.4

10
openstack/python-wsme/centos/patches/0001-log-client-side-errors.patch
View File

@ -1,7 +1,7 @@
From cf0c831d31b970bf920f3152d50d849193e9154a Mon Sep 17 00:00:00 2001 From 07bc9cce658f77307167398f3e555b1b50cf8caf Mon Sep 17 00:00:00 2001
From: Kam Nasim <kam.nasim@windriver.com> From: Kam Nasim <kam.nasim@windriver.com>
Date: Tue, 3 Jan 2017 13:09:29 -0500 Date: Tue, 3 Jan 2017 13:09:29 -0500
Subject: [PATCH] change ClientSideError logging verbosity Subject: change ClientSideError logging verbosity
Regression introduced in 16.10. Reverts the following Regression introduced in 16.10. Reverts the following
upstream commit since WSME is used by SysInv-api to return ClientSideErrors, upstream commit since WSME is used by SysInv-api to return ClientSideErrors,
@ -24,10 +24,10 @@ Reverting commit 94cd1751c7b028898a38fda0689cfce15e2a96e2
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/wsme/api.py b/wsme/api.py diff --git a/wsme/api.py b/wsme/api.py
index 4aab9a4..2ba70e0 100644 index e5fe7c6..4c4c7ad 100644
--- a/wsme/api.py --- a/wsme/api.py
+++ b/wsme/api.py +++ b/wsme/api.py
@@ -218,7 +218,7 @@ def format_exception(excinfo, debug=False): @@ -219,7 +219,7 @@ def format_exception(excinfo, debug=False):
else six.text_type(error)) else six.text_type(error))
r = dict(faultcode="Client", r = dict(faultcode="Client",
faultstring=faultstring) faultstring=faultstring)
@ -37,5 +37,5 @@ index 4aab9a4..2ba70e0 100644
return r return r
else: else:
-- --
1.8.3.1 2.7.4