diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-05-07 21:52:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-05-07 21:52:29 +0000 |
| commit | f729925f5a3231c1b8ec2cb3c9c5fcd2bc68dbbb (patch) | |
| tree | 7233679203217fdb3afb0f2bb497ce57fd669fbd /nova/db | |
| parent | b279d8a547628aab8ad98468571c04e2ecd45a56 (diff) | |
| parent | 2f552e957fddcd9e042a09a2d32d32fa564c18e7 (diff) | |
Merge "Replaces exceptions.Error with NovaException"
Diffstat (limited to 'nova/db')
| -rw-r--r-- | nova/db/api.py | 4 | ||||
| -rw-r--r-- | nova/db/sqlalchemy/migration.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/nova/db/api.py b/nova/db/api.py index 687e7b91b..44fbe599c 100644 --- a/nova/db/api.py +++ b/nova/db/api.py @@ -74,12 +74,12 @@ IMPL = utils.LazyPluggable('db_backend', sqlalchemy='nova.db.sqlalchemy.api') -class NoMoreNetworks(exception.Error): +class NoMoreNetworks(exception.NovaException): """No more available networks.""" pass -class NoMoreTargets(exception.Error): +class NoMoreTargets(exception.NovaException): """No more available targets""" pass diff --git a/nova/db/sqlalchemy/migration.py b/nova/db/sqlalchemy/migration.py index befb4cbec..698e7875a 100644 --- a/nova/db/sqlalchemy/migration.py +++ b/nova/db/sqlalchemy/migration.py @@ -72,7 +72,7 @@ def db_sync(version=None): try: version = int(version) except ValueError: - raise exception.Error(_("version should be an integer")) + raise exception.NovaException(_("version should be an integer")) current_version = db_version() repository = _find_migrate_repo() |