From: Angus Salkeld <asalkeld@redhat.com>
Date: Wed, 18 Apr 2012 02:25:16 +0000 (+1000)
Subject: Fix the version file (don't import glance's git commit)
X-Git-Tag: 2014.1~1970
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=8a317678cf7a4e846141b54e881fb19ecb7b4220;p=openstack-build%2Fheat-build.git

Fix the version file (don't import glance's git commit)

Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
---

diff --git a/heat/version.py b/heat/version.py
index edbe8b9d..37fe89e6 100644
--- a/heat/version.py
+++ b/heat/version.py
@@ -14,20 +14,20 @@
 #    under the License.
 
 try:
-    from glance.vcsversion import version_info
+    from heat.vcsversion import version_info
 except ImportError:
     version_info = {'branch_nick': u'LOCALBRANCH',
                     'revision_id': 'LOCALREVISION',
                     'revno': 0}
 
-GLANCE_VERSION = ['0.0', '2']
-COUNT, REVISION = GLANCE_VERSION
+HEAT_VERSION = ['0.0', '2']
+COUNT, REVISION = HEAT_VERSION
 
 FINAL = False   # This becomes true at Release Candidate time
 
 
 def canonical_version_string():
-    return '.'.join(filter(None, GLANCE_VERSION))
+    return '.'.join(filter(None, HEAT_VERSION))
 
 
 def version_string():