X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=rpm%2FSOURCES%2Fopenstack-ceilometer-newdeps.patch;h=099a882d80748ae165ec76c903435b9b446884ef;hb=7b869ee6899d93ee07c5810398ee0656b7f6a66c;hp=dc9f441263b0e97ce269a295d2f08179b123f8a4;hpb=e9b69fab1e9e91746fbb7bb336795904f40768a3;p=openstack-build%2Fceilometer-build.git

diff --git a/rpm/SOURCES/openstack-ceilometer-newdeps.patch b/rpm/SOURCES/openstack-ceilometer-newdeps.patch
index dc9f441..099a882 100644
--- a/rpm/SOURCES/openstack-ceilometer-newdeps.patch
+++ b/rpm/SOURCES/openstack-ceilometer-newdeps.patch
@@ -1,11 +1,7 @@
-diff -Naur ceilometer-2013.2.b1.orig/ceilometer/__init__.py ceilometer-2013.2.b1/ceilometer/__init__.py
---- ceilometer-2013.2.b1.orig/ceilometer/__init__.py	2013-05-30 15:09:28.000000000 +0000
-+++ ceilometer-2013.2.b1/ceilometer/__init__.py	2013-05-31 16:05:56.366704819 +0000
-@@ -13,3 +13,25 @@
- # License for the specific language governing permissions and limitations
- # under the License.
- #
-+
+diff -Naur ceilometer-2014.1.b2.orig/ceilometer/__init__.py ceilometer-2014.1.b2/ceilometer/__init__.py
+--- ceilometer-2014.1.b2.orig/ceilometer/__init__.py	2014-01-23 14:55:44.000000000 +0000
++++ ceilometer-2014.1.b2/ceilometer/__init__.py	2014-01-27 15:03:39.691353920 +0000
+@@ -0,0 +1,21 @@
 +import sys
 +import pkg_resources
 +
@@ -27,21 +23,3 @@ diff -Naur ceilometer-2013.2.b1.orig/ceilometer/__init__.py ceilometer-2013.2.b1
 +
 +replace_dist("WebOb >= 1.2")
 +replace_dist("SQLAlchemy >= 0.7.3")
-diff -Naur ceilometer-2013.2.b1.orig/ceilometer/storage/sqlalchemy/migration.py ceilometer-2013.2.b1/ceilometer/storage/sqlalchemy/migration.py
---- ceilometer-2013.2.b1.orig/ceilometer/storage/sqlalchemy/migration.py	2013-05-30 15:09:28.000000000 +0000
-+++ ceilometer-2013.2.b1/ceilometer/storage/sqlalchemy/migration.py	2013-05-31 16:03:43.209551099 +0000
-@@ -52,7 +52,13 @@
- 
- 
- # NOTE(jkoelker) Delay importing migrate until we are patched
--from migrate import exceptions as versioning_exceptions
-+try:
-+    # Try the more specific path first (migrate <= 0.6)
-+    from migrate.versioning import exceptions as versioning_exceptions
-+except ImportError:
-+    # Use the newer path (migrate >= 0.7)
-+    from migrate import exceptions as versioning_exceptions
-+
- from migrate.versioning import api as versioning_api
- from migrate.versioning.repository import Repository
-