-+
- import gettext
-
- gettext.install('ceilometer', unicode=1)
-diff -Naur ceilometer-2013.1.g3.orig/ceilometer/storage/sqlalchemy/migration.py ceilometer-2013.1.g3/ceilometer/storage/sqlalchemy/migration.py
---- ceilometer-2013.1.g3.orig/ceilometer/storage/sqlalchemy/migration.py 2013-04-08 09:54:04.608469135 +0000
-+++ ceilometer-2013.1.g3/ceilometer/storage/sqlalchemy/migration.py 2013-04-08 10:06:21.515180041 +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
-