Attachment 936085 Details for Bug 1133431 – proposed patch for RHOS4 with Pete's fix from rhbz#971026

[patch] proposed patch for RHOS4 with Pete's fix from rhbz#971026

0001-webob-is-required-by-s3_token-middleware.patch (text/plain), 3.70 KB, created by Alan Pevec on 2014-09-10 09:39:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alan Pevec

Created: 2014-09-10 09:39:22 UTC

Size: 3.70 KB

patch

obsolete

>From 0b7dd61ce8cc7eab55d01aadcbfa3789dad021b3 Mon Sep 17 00:00:00 2001
>From: Alan Pevec <alan.pevec@redhat.com>
>Date: Wed, 27 Aug 2014 12:15:49 +0200
>Subject: [PATCH] webob is required by s3_token middleware
>
>Related: rhbz#1133431
>---
> 0006-Use-python-webob1.2.patch | 46 ++++++++++++++++++++++++++++++++++++++++++
> python-keystoneclient.spec     | 10 ++++++++-
> 2 files changed, 55 insertions(+), 1 deletion(-)
> create mode 100644 0006-Use-python-webob1.2.patch
>
>diff --git a/0006-Use-python-webob1.2.patch b/0006-Use-python-webob1.2.patch
>new file mode 100644
>index 0000000..1031839
>--- /dev/null
>+++ b/0006-Use-python-webob1.2.patch
>@@ -0,0 +1,46 @@
>+From d5711c1818166afe7caa6109b60b24196318b2bf Mon Sep 17 00:00:00 2001
>+From: Pete Zaitcev <zaitcev@kotori.zaitcev.us>
>+Date: Wed, 5 Jun 2013 15:01:52 -0600
>+Subject: [PATCH] Use python-webob1.2
>+
>+s3token needs newer webob
>+
>+Change-Id: I718fa40cd31fc9b66e78bac17ba261f7d789c92c
>+Resolves rhbz: 1133431
>+---
>+ keystoneclient/__init__.py | 22 ++++++++++++++++++++++
>+ 1 file changed, 22 insertions(+)
>+
>+diff --git a/keystoneclient/__init__.py b/keystoneclient/__init__.py
>+index f735877..70f926e 100644
>+--- a/keystoneclient/__init__.py
>++++ b/keystoneclient/__init__.py
>+@@ -15,6 +15,28 @@
>+ 
>+ __version__ = "REDHATKEYSTONECLIENTVERSION"
>+ 
>++import sys
>++import pkg_resources
>++
>++
>++# If there is a conflicting non egg module,
>++# i.e. an older standard system module installed,
>++# then replace it with this requirement
>++def replace_dist(requirement):
>++    try:
>++        return pkg_resources.require(requirement)
>++    except pkg_resources.VersionConflict:
>++        e = sys.exc_info()[1]
>++        dist=e.args[0]
>++        req=e.args[1]
>++        if dist.key == req.key and not dist.location.endswith('.egg'):
>++            del pkg_resources.working_set.by_key[dist.key]
>++            # We assume there is no need to adjust sys.path
>++            # and the associated pkg_resources.working_set.entries
>++            return pkg_resources.require(requirement)
>++
>++replace_dist("WebOb >= 1.2")
>++
>+ __all__ = [
>+     # Modules
>+     'generic',
>diff --git a/python-keystoneclient.spec b/python-keystoneclient.spec
>index 02b7131..4875e15 100644
>--- a/python-keystoneclient.spec
>+++ b/python-keystoneclient.spec
>@@ -4,7 +4,7 @@ Name:       python-keystoneclient
> # https://lists.launchpad.net/openstack/msg14248.html
> Epoch:      1
> Version:    0.7.1
>-Release:    3%{?dist}
>+Release:    4%{?dist}
> Summary:    Client library for OpenStack Identity API
> License:    ASL 2.0
> URL:        http://pypi.python.org/pypi/%{name}
>@@ -18,6 +18,7 @@ Patch0002: 0002-Remove-runtime-dependency-on-python-pbr.patch
> Patch0003: 0003-Fixes-an-erroneous-type-check-in-a-test.patch
> Patch0004: 0004-Allow-passing-kwargs-from-managers-to-session.patch
> Patch0005: 0005-Don-t-log-sensitive-auth-data.patch
>+Patch0006: 0006-Use-python-webob1.2.patch
> 
> BuildArch:  noarch
> 
>@@ -39,6 +40,9 @@ Requires: python-babel
> Requires: python-netaddr
> Requires: python-setuptools
> Requires: python-keyring
>+# for s3_token middleware
>+BuildRequires: python-webob1.2
>+Requires: python-webob1.2
> 
> 
> %description
>@@ -63,6 +67,7 @@ Identity API.
> %patch0003 -p1
> %patch0004 -p1
> %patch0005 -p1
>+%patch0006 -p1
> 
> # We provide version like this in order to remove runtime dep on pbr.
> sed -i s/REDHATKEYSTONECLIENTVERSION/%{version}/ keystoneclient/__init__.py
>@@ -110,6 +115,9 @@ rm -fr doc/build/html/.doctrees doc/build/html/.buildinfo
> %doc LICENSE doc/build/html
> 
> %changelog
>+* Wed Sep 10 2014 Alan Pevec <apevec@redhat.com> 1:0.7.1-4
>+- webob 1.2 is required by s3_token middleware
>+
> * Thu Aug 28 2014 Jakub Ruzicka <jruzicka@redhat.com> 1:0.7.1-3
> - Don't log sensitive auth data (rhbz#1109874)
> - Allow passing kwargs from managers to session
>-- 
>1.9.3
>

Flags:

zaitcev: review+

Actions: View | Diff

Attachments on bug 1133431: 931374 | 931388 | 931389 | 936085