Merge with trunk

1 files changed, 12 insertions, 1 deletions

diff --git a/setup.py b/setup.py
index 1abf4d9fe..5b58274c6 100644
--- a/setup.py
+++ b/setup.py
@@ -24,6 +24,15 @@ from setuptools.command.sdist import sdist
 from sphinx.setup_command import BuildDoc
 
 from nova.utils import parse_mailmap, str_dict_replace
+from nova import version
+
+if os.path.isdir('.bzr'):
+    with open("nova/vcsversion.py", 'w') as version_file:
+        vcs_cmd = subprocess.Popen(["bzr", "version-info", "--python"],
+                                   stdout=subprocess.PIPE)
+        vcsversion = vcs_cmd.communicate()[0]
+        version_file.write(vcsversion)
+
 
 class local_BuildDoc(BuildDoc):
     def run(self):
@@ -49,7 +58,7 @@ class local_sdist(sdist):
         sdist.run(self)
 
 setup(name='nova',
-      version='2011.1',
+      version=version.canonical_version_string(),
       description='cloud computing fabric controller',
       author='OpenStack',
       author_email='nova@lists.launchpad.net',
@@ -64,9 +73,11 @@ setup(name='nova',
                'bin/nova-dhcpbridge',
                'bin/nova-import-canonical-imagestore',
                'bin/nova-instancemonitor',
+               'bin/nova-logspool',
                'bin/nova-manage',
                'bin/nova-network',
                'bin/nova-objectstore',
                'bin/nova-scheduler',
+               'bin/nova-spoolsentry',
                'bin/nova-volume',
                'tools/nova-debug'])