diff options
| author | Monsyne Dragon <mdragon@rackspace.com> | 2011-01-05 22:11:05 -0600 |
|---|---|---|
| committer | Monsyne Dragon <mdragon@rackspace.com> | 2011-01-05 22:11:05 -0600 |
| commit | b55940e8e3d977960ff60f4cb7cff4b6ea2e8fb8 (patch) | |
| tree | 1115bf6dc7b6376a13fd4d68f1ebce7d9028ec71 /nova/db | |
| parent | f9fa25f9a873c1e4831c342689f7b5adc8f41013 (diff) | |
| download | nova-b55940e8e3d977960ff60f4cb7cff4b6ea2e8fb8.tar.gz nova-b55940e8e3d977960ff60f4cb7cff4b6ea2e8fb8.tar.xz nova-b55940e8e3d977960ff60f4cb7cff4b6ea2e8fb8.zip | |
fix some glitches due to someone removing instanc.internal_id (not that I mind)
remove accidental change to nova-combined script
Diffstat (limited to 'nova/db')
| -rw-r--r-- | nova/db/sqlalchemy/api.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index 7b70566eb..6f4d068f1 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -1918,7 +1918,7 @@ def console_get(context, console_id, instance_id=None): query = query.filter_by(instance_id=instance_id) result = query.options(joinedload('pool')).first() if not result: - idesc = _(" on instance %(instance_id)s") if instance_id else "" - raise exception.NotFound(_("No console with id %(instance)s") % - {'instance': idesc}) + idesc = (_("on instance %s") % instance_id) if instance_id else "" + raise exception.NotFound(_("No console with id %(console_id)s %(instance)s") % + {'instance': idesc, 'console_id': console_id}) return result |