Attachment 587469 Details for Bug 826120 – Proposed patch

[patch] Proposed patch

0001-fix-paste.deploy-dependency.patch (text/plain), 1.94 KB, created by Alan Pevec on 2012-05-29 17:43:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alan Pevec

Created: 2012-05-29 17:43:24 UTC

Size: 1.94 KB

patch

obsolete

>From a30239ceac17dd128f34585eb00cae5a544b2c20 Mon Sep 17 00:00:00 2001
>From: Alan Pevec <apevec@redhat.com>
>Date: Tue, 29 May 2012 19:39:24 +0200
>Subject: [PATCH] fix paste.deploy dependency
>
>parallel installed versions are loaded in keystone package,
>so import paste.deploy after keystone in keystone-all
>
>rhbz#826120
>---
> openstack-keystone-newdeps.patch |   16 ++++++++++++++++
> openstack-keystone.spec          |    5 ++++-
> 2 files changed, 20 insertions(+), 1 deletions(-)
>
>diff --git a/openstack-keystone-newdeps.patch b/openstack-keystone-newdeps.patch
>index 4271c69..b6f88aa 100644
>--- a/openstack-keystone-newdeps.patch
>+++ b/openstack-keystone-newdeps.patch
>@@ -30,3 +30,19 @@
> +# TODO: See can we get pkg_resources to do the right thing directly
> +import paste
> +paste.__path__.insert(0, paste.__path__.pop(-1))
>+--- keystone-2012.1/bin/keystone-all.orig	2012-04-04 04:22:54.000000000 +0200
>++++ keystone-2012.1/bin/keystone-all	2012-05-29 19:32:51.728668936 +0200
>+@@ -16,11 +16,11 @@
>+                                '__init__.py')):
>+     sys.path.insert(0, possible_topdir)
>+ 
>+-from paste import deploy
>+-
>+ from keystone import config
>+ from keystone.common import wsgi
>+ 
>++from paste import deploy
>++
>+ 
>+ CONF = config.CONF
>+ 
>diff --git a/openstack-keystone.spec b/openstack-keystone.spec
>index a222bf8..5b67830 100644
>--- a/openstack-keystone.spec
>+++ b/openstack-keystone.spec
>@@ -11,7 +11,7 @@
> 
> Name:           openstack-keystone
> Version:        2012.1
>-Release:        5%{?dist}
>+Release:        6%{?dist}
> #Release:       0.1.%{release_letter}%{milestone}%{?dist}
> Summary:        OpenStack Identity Service
> 
>@@ -197,6 +197,9 @@ fi
> %{python_sitelib}/keystone-%{version}-*.egg-info
> 
> %changelog
>+* Tue May 29 2012 Alan Pevec <apevec@redhat.com> 2012.1-6
>+- fix paste.deploy dependency (rhbz#826120)
>+
> * Mon May 21 2012 Alan Pevec <apevec@redhat.com> 2012.1-5
> - Sync up with Essex stable branch
> - Remove dependencies no loner needed by Essex
>-- 
>1.7.7.6
>

Flags:

apevec: review? (pbrady)
pbrady: review+

Actions: View | Diff

Attachments on bug 826120: 587469