Merge "de-fuzz python-wsme patches"

This commit is contained in:
Zuul 2018-09-27 19:02:08 +00:00 committed by Gerrit Code Review
commit 4316ba86ba
2 changed files with 10 additions and 10 deletions

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>
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 ------
1 file changed, 6 deletions(-)
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
+++ 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}
%endif
@ -25,5 +25,5 @@ index 4a2c360..602bff0 100644
%doc README.rst examples/
%license LICENSE
--
1.8.3.1
2.7.4

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>
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
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(-)
diff --git a/wsme/api.py b/wsme/api.py
index 4aab9a4..2ba70e0 100644
index e5fe7c6..4c4c7ad 100644
--- a/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))
r = dict(faultcode="Client",
faultstring=faultstring)
@ -37,5 +37,5 @@ index 4aab9a4..2ba70e0 100644
return r
else:
--
1.8.3.1
2.7.4