summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-04-09 22:03:28 +0000
committerGerrit Code Review <review@openstack.org>2015-04-09 22:03:28 +0000
commitda4fb02ad6a190dc8e93b7683c04b1feb5a4c9ea (patch)
treef8715159d8e26c7596865366ff6b2d93571e0938
parenta4bd859acfbaf0c39fe4431dc6f130004be1ac33 (diff)
parentfe7ef09b3808509e010048184fa8d5acbf8312e5 (diff)
downloadglance-da4fb02ad6a190dc8e93b7683c04b1feb5a4c9ea.tar.gz
Merge "Fixes glance-manage exporting meta definitions issue"2015.1.0rc1proposed/kilo
-rwxr-xr-xglance/db/sqlalchemy/metadata.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/glance/db/sqlalchemy/metadata.py b/glance/db/sqlalchemy/metadata.py
index 1557168b4..aeebcc3e8 100755
--- a/glance/db/sqlalchemy/metadata.py
+++ b/glance/db/sqlalchemy/metadata.py
@@ -91,9 +91,8 @@ def _get_resource_type_id(meta, name):
def _get_resource_type(meta, resource_type_id):
rt_table = get_metadef_resource_types_table(meta)
return (
- select([rt_table.c.id]).
+ rt_table.select().
where(rt_table.c.id == resource_type_id).
- select_from(rt_table).
execute().fetchone())