summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2011-11-01 21:57:43 +0000
committerGerrit Code Review <review@openstack.org>2011-11-01 21:57:43 +0000
commitd3e0cfcc7f7bc24b4bd551f5b5c0c952f2fd2f3f (patch)
tree0185e28cf4ed4c9a582e889d37654892f22a5852
parent71bd02356b41f682c6a196f75e0ed1accc8f5fb6 (diff)
parentaf5ee6855b17acca3ec182650a26c3d2d33bcad9 (diff)
downloadnova-d3e0cfcc7f7bc24b4bd551f5b5c0c952f2fd2f3f.tar.gz
nova-d3e0cfcc7f7bc24b4bd551f5b5c0c952f2fd2f3f.tar.xz
nova-d3e0cfcc7f7bc24b4bd551f5b5c0c952f2fd2f3f.zip
Merge "Fix KeyError when passed unknown format of time"
-rw-r--r--nova/image/glance.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/image/glance.py b/nova/image/glance.py
index c9ce946b8..9eea8eb4c 100644
--- a/nova/image/glance.py
+++ b/nova/image/glance.py
@@ -396,7 +396,7 @@ def _parse_glance_iso8601_timestamp(timestamp):
pass
raise ValueError(_('%(timestamp)s does not follow any of the '
- 'signatures: %(ISO_FORMATS)s') % locals())
+ 'signatures: %(iso_formats)s') % locals())
# TODO(yamahata): use block-device-mapping extension to glance