From 3e412a5f34c6dae44d8f4d6bce030fb267aa5aea Mon Sep 17 00:00:00 2001
From: "jaypipes@gmail.com" <>
Date: Mon, 14 Feb 2011 11:04:45 -0500
Subject: Merge Distutils.Extra changes for automating translation message
 catalog compilation

---
 setup.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'setup.py')

diff --git a/setup.py b/setup.py
index e3c45ce3e..c9393c508 100644
--- a/setup.py
+++ b/setup.py
@@ -19,9 +19,17 @@
 import os
 import subprocess
 
-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 +83,7 @@ try:
 except:
     pass
 
-setup(name='nova',
+DistUtilsExtra.auto.setup(name='nova',
       version=version.canonical_version_string(),
       description='cloud computing fabric controller',
       author='OpenStack',
-- 
cgit 


From 8b30a903a4d2c5c6ffe44e58b8531ddc889492c0 Mon Sep 17 00:00:00 2001
From: "jaypipes@gmail.com" <>
Date: Mon, 21 Feb 2011 13:10:45 -0500
Subject: PEP8 errors and remove check in authors file for nova-core, since
 nova-core owns the translation export branch

---
 setup.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'setup.py')

diff --git a/setup.py b/setup.py
index 89add02c3..4ab8f386b 100644
--- a/setup.py
+++ b/setup.py
@@ -26,9 +26,11 @@ 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'
+    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'
+assert DistUtilsExtra.auto.__version__ >= '2.18',\
+       'needs DistUtilsExtra.auto >= 2.18'
 
 
 from nova.utils import parse_mailmap, str_dict_replace
-- 
cgit 


From 912e762c9baf3cb17a24bc0d9feba4b26892dbbc Mon Sep 17 00:00:00 2001
From: Thierry Carrez <thierry@openstack.org>
Date: Tue, 22 Feb 2011 17:37:12 +0100
Subject: Also remove nova-combined from setup.py

---
 setup.py | 1 -
 1 file changed, 1 deletion(-)

(limited to 'setup.py')

diff --git a/setup.py b/setup.py
index 4ab8f386b..3b48990ac 100644
--- a/setup.py
+++ b/setup.py
@@ -98,7 +98,6 @@ DistUtilsExtra.auto.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',
-- 
cgit