[openstack-cinder/el6] fix the use of the parallel installed sqlalchemy

[Pádraig Brady]

commit 8f10058259c157d735133a14c4fe8c2c5669b7ae
Author: Pádraig Brady <P at draigBrady.com>
Date:   Wed Oct 24 17:28:55 2012 +0100

    fix the use of the parallel installed sqlalchemy
    
    Change the order of the sqlalchemy import in cinder-manage,
    to ensure the ordering adjustments in cinder/__init__.py take precedence

 openstack-cinder-newdeps.patch |   24 ++++++++++++++++++++++++
 openstack-cinder.spec          |    4 ++--
 2 files changed, 26 insertions(+), 2 deletions(-)
---
diff --git a/openstack-cinder-newdeps.patch b/openstack-cinder-newdeps.patch
index b3ff588..676a6df 100644
--- a/openstack-cinder-newdeps.patch
+++ b/openstack-cinder-newdeps.patch
@@ -38,3 +38,27 @@ diff -Naur cinder-2012.2.orig/cinder/__init__.py cinder-2012.2/cinder/__init__.p
  import gettext
  
  
+diff -Naur cinder-2012.2.orig/bin/cinder-manage cinder-2012.2/bin/cinder-manage
+--- cinder-2012.2.orig/bin/cinder-manage	2012-09-26 00:48:58.000000000 +0000
++++ cinder-2012.2/bin/cinder-manage	2012-10-24 16:25:14.105662747 +0000
+@@ -59,9 +59,6 @@
+ import os
+ import sys
+ 
+-from sqlalchemy import create_engine, MetaData, Table
+-from sqlalchemy.orm import sessionmaker
+-from sqlalchemy.ext.declarative import declarative_base
+ 
+ 
+ # If ../cinder/__init__.py exists, add ../ to Python search path, so that
+@@ -85,6 +82,10 @@
+ from cinder import utils
+ from cinder import version
+ 
++from sqlalchemy import create_engine, MetaData, Table
++from sqlalchemy.orm import sessionmaker
++from sqlalchemy.ext.declarative import declarative_base
++
+ FLAGS = flags.FLAGS
+ 
+ 
diff --git a/openstack-cinder.spec b/openstack-cinder.spec
index 60970e9..9828b5e 100644
--- a/openstack-cinder.spec
+++ b/openstack-cinder.spec
@@ -2,7 +2,7 @@
 
 Name:             openstack-cinder
 Version:          2012.2
-Release:          1%{?dist}
+Release:          2%{?dist}
 Summary:          OpenStack Volume service
 
 Group:            Applications/System
@@ -285,5 +285,5 @@ fi
 %endif
 
 %changelog
-* Wed Oct 24 2012 Pádraig Brady <P at draigBrady.com> - 2012.2-1
+* Wed Oct 24 2012 Pádraig Brady <P at draigBrady.com> - 2012.2-2
 - Initial Folsom release