Update to use read_versioninfo.0.1

Change-Id: Icfc4935b3ff52a6918009c6835118c2e7ae15e5c

2 files changed, 25 insertions, 6 deletions

diff --git a/cinderclient/openstack/common/setup.py b/cinderclient/openstack/common/setup.py
index dc7509c..caf06fa 100644
--- a/cinderclient/openstack/common/setup.py
+++ b/cinderclient/openstack/common/setup.py
@@ -35,8 +35,7 @@ def parse_mailmap(mailmap='.mailmap'):
         for l in fp:
             l = l.strip()
             if not l.startswith('#') and ' ' in l:
-                canonical_email, alias = [x for x in l.split(' ')
-                                          if x.startswith('<')]
+                canonical_email, alias = l.split(' ')
                 mapping[alias] = canonical_email
     return mapping
 
@@ -206,6 +205,20 @@ _rst_template = """%(heading)s
 """
 
 
+def read_versioninfo(project):
+    """Read the versioninfo file. If it doesn't exist, we're in a github
+       zipball, and there's really know way to know what version we really
+       are, but that should be ok, because the utility of that should be
+       just about nil if this code path is in use in the first place."""
+    versioninfo_path = os.path.join(project, 'versioninfo')
+    if os.path.exists(versioninfo_path):
+        with open(versioninfo_path, 'r') as vinfo:
+            version = vinfo.read().strip()
+    else:
+        version = "0.0.0"
+    return version
+
+
 def write_versioninfo(project, version):
     """Write a simple file containing the version of the package."""
     open(os.path.join(project, 'versioninfo'), 'w').write("%s\n" % version)
@@ -313,9 +326,8 @@ def get_pre_version(projectname, base_version):
         write_versioninfo(projectname, version)
         return version.split('~')[0]
     else:
-        with open(os.path.join(projectname, 'versioninfo'), 'r') as vinfo:
-            full_version = vinfo.read().strip()
-            return full_version.split('~')[0]
+        version = read_versioninfo(projectname)
+    return version.split('~')[0]
 
 
 def get_post_version(projectname):
@@ -327,4 +339,4 @@ def get_post_version(projectname):
         version = _get_git_post_version()
         write_versioninfo(projectname, version)
         return version
-    return open(os.path.join(projectname, 'versioninfo'), 'r').read().strip()
+    return read_versioninfo(projectname)
diff --git a/openstack-common.conf b/openstack-common.conf
new file mode 100644
index 0000000..969aea6
--- /dev/null
+++ b/openstack-common.conf
@@ -0,0 +1,7 @@
+[DEFAULT]
+
+# The list of modules to copy from openstack-common
+modules=setup
+
+# The base module to hold the copy of openstack.common
+base=cinderclient