From 7168812fdf56280f24dc977c5dd9c7a73959c2a2 Mon Sep 17 00:00:00 2001
From: Brian Waldon <brian.waldon@rackspace.com>
Date: Fri, 22 Apr 2011 13:30:13 -0400
Subject: adding gettext to setup.py

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

(limited to 'setup.py')

diff --git a/setup.py b/setup.py
index 6c45109bc..194b55183 100644
--- a/setup.py
+++ b/setup.py
@@ -16,6 +16,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import gettext
 import glob
 import os
 import subprocess
@@ -33,6 +34,7 @@ except ImportError:
 assert DistUtilsExtra.auto.__version__ >= '2.18',\
        'needs DistUtilsExtra.auto >= 2.18'
 
+gettext.install('nova', unicode=1)
 
 from nova.utils import parse_mailmap, str_dict_replace
 from nova import version
-- 
cgit 


From c95aaaaefe11048990021d376dbca6460f19248c Mon Sep 17 00:00:00 2001
From: "jaypipes@gmail.com" <>
Date: Tue, 26 Apr 2011 14:17:09 -0700
Subject: Make the import of distutils.extra non-mandatory in setup.py. Just
 print a warning that i18n commands are not available...

---
 setup.py | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

(limited to 'setup.py')

diff --git a/setup.py b/setup.py
index 194b55183..c165f40d7 100644
--- a/setup.py
+++ b/setup.py
@@ -25,14 +25,18 @@ import sys
 from setuptools import find_packages
 from setuptools.command.sdist import sdist
 
+# In order to run the i18n commands for compiling and
+# installing message catalogs, we use DistUtilsExtra.
+# Don't make this a hard requirement, but warn that
+# i18n commands won't be available if DistUtilsExtra is
+# not installed...
 try:
-    import DistUtilsExtra.auto
+    from DistUtilsExtra.auto import setup
 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 setuptools import setup
+    print "Warning: DistUtilsExtra required to use i18n builders. "
+    print "To build nova with support for message catalogs, you need "
+    print "  https://launchpad.net/python-distutils-extra >= 2.18"
 
 gettext.install('nova', unicode=1)
 
@@ -102,7 +106,7 @@ def find_data_files(destdir, srcdir):
     package_data += [(destdir, files)]
     return package_data
 
-DistUtilsExtra.auto.setup(name='nova',
+setup(name='nova',
       version=version.canonical_version_string(),
       description='cloud computing fabric controller',
       author='OpenStack',
-- 
cgit