Make the import of distutils.extra non-mandatory in setup.py. Just print a warning that i18n commands are not available...

This commit is contained in:
jaypipes@gmail.com 2011-04-26 14:17:09 -07:00
parent 5ea80e2f62
commit c95aaaaefe

@ -25,14 +25,18 @@ import sys
from setuptools import find_packages from setuptools import find_packages
from setuptools.command.sdist import sdist 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: try:
import DistUtilsExtra.auto from DistUtilsExtra.auto import setup
except ImportError: except ImportError:
print >> sys.stderr, 'To build nova you need '\ from setuptools import setup
'https://launchpad.net/python-distutils-extra' print "Warning: DistUtilsExtra required to use i18n builders. "
sys.exit(1) print "To build nova with support for message catalogs, you need "
assert DistUtilsExtra.auto.__version__ >= '2.18',\ print " https://launchpad.net/python-distutils-extra >= 2.18"
'needs DistUtilsExtra.auto >= 2.18'
gettext.install('nova', unicode=1) gettext.install('nova', unicode=1)
@ -102,7 +106,7 @@ def find_data_files(destdir, srcdir):
package_data += [(destdir, files)] package_data += [(destdir, files)]
return package_data return package_data
DistUtilsExtra.auto.setup(name='nova', setup(name='nova',
version=version.canonical_version_string(), version=version.canonical_version_string(),
description='cloud computing fabric controller', description='cloud computing fabric controller',
author='OpenStack', author='OpenStack',