diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-03-31 15:40:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-03-31 15:40:21 +0000 |
| commit | aa6fa5e975606576c759ed14d1e4d67186e2a377 (patch) | |
| tree | 7eff347a0c2c8d97d6d4b9236f0e099ff8d2fe4e | |
| parent | 68d3e9a38fe02ebfaa62522f497b7ab7bc8d00e7 (diff) | |
| parent | f91569de61e6b91a2d6288c5f06f12d65946d80d (diff) | |
| download | heat-2014.1.rc1.tar.gz | |
Merge "version migration fails if version is an integer"2014.1.rc1
| -rw-r--r-- | heat/db/sqlalchemy/migrate_repo/versions/043_migrate_template_versions.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/heat/db/sqlalchemy/migrate_repo/versions/043_migrate_template_versions.py b/heat/db/sqlalchemy/migrate_repo/versions/043_migrate_template_versions.py index 82eef6a5b..eef71b3a3 100644 --- a/heat/db/sqlalchemy/migrate_repo/versions/043_migrate_template_versions.py +++ b/heat/db/sqlalchemy/migrate_repo/versions/043_migrate_template_versions.py @@ -44,7 +44,7 @@ def upgrade(migrate_engine): try: dt = time.strptime(version, '%Y-%m-%d') - except ValueError: + except (TypeError, ValueError): dt = None if dt is None or dt < patch_date: |