Merging trunk, small fixes

1 files changed, 13 insertions, 3 deletions

diff --git a/setup.py b/setup.py
index 4e25f43ed..3b48990ac 100644
--- a/setup.py
+++ b/setup.py
@@ -18,10 +18,21 @@
 
 import os
 import subprocess
+import sys
 
-from setuptools import setup, find_packages
+from setuptools import find_packages
 from setuptools.command.sdist import sdist
 
+try:
+    import DistUtilsExtra.auto
+except ImportError:
+    print >> sys.stderr, 'To build nova you need '\
+                         'https://launchpad.net/python-distutils-extra'
+    sys.exit(1)
+assert DistUtilsExtra.auto.__version__ >= '2.18',\
+       'needs DistUtilsExtra.auto >= 2.18'
+
+
 from nova.utils import parse_mailmap, str_dict_replace
 from nova import version
 
@@ -75,7 +86,7 @@ try:
 except:
     pass
 
-setup(name='nova',
+DistUtilsExtra.auto.setup(name='nova',
       version=version.canonical_version_string(),
       description='cloud computing fabric controller',
       author='OpenStack',
@@ -87,7 +98,6 @@ setup(name='nova',
       test_suite='nose.collector',
       scripts=['bin/nova-ajax-console-proxy',
                'bin/nova-api',
-               'bin/nova-combined',
                'bin/nova-compute',
                'bin/nova-console',
                'bin/nova-dhcpbridge',