diff options
| author | Cory Wright <cory.wright@rackspace.com> | 2010-12-27 11:27:46 -0500 |
|---|---|---|
| committer | Cory Wright <cory.wright@rackspace.com> | 2010-12-27 11:27:46 -0500 |
| commit | d009dcbfb458e825e6a6f70312f846c96c2ddca2 (patch) | |
| tree | e3c17b4d1db214f02ec0d1dc495dd419efad8e04 /bin | |
| parent | b98c22f6b6a8c09f6a30485ca46ecd6860e6a005 (diff) | |
| parent | 0ef58bac84f5a5824cf91cc3d583ded2ccb1fd9a (diff) | |
| download | nova-d009dcbfb458e825e6a6f70312f846c96c2ddca2.tar.gz nova-d009dcbfb458e825e6a6f70312f846c96c2ddca2.tar.xz nova-d009dcbfb458e825e6a6f70312f846c96c2ddca2.zip | |
merge trunk
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/nova-combined | 3 | ||||
| -rwxr-xr-x | bin/nova-dhcpbridge | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/bin/nova-combined b/bin/nova-combined index c6a04f7e9..53322f1a0 100755 --- a/bin/nova-combined +++ b/bin/nova-combined @@ -22,6 +22,7 @@ import eventlet eventlet.monkey_patch() +import gettext import os import sys @@ -33,6 +34,8 @@ possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]), if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')): sys.path.insert(0, possible_topdir) +gettext.install('nova', unicode=1) + from nova import api from nova import flags from nova import service diff --git a/bin/nova-dhcpbridge b/bin/nova-dhcpbridge index 81b9b6dd3..828aba3d1 100755 --- a/bin/nova-dhcpbridge +++ b/bin/nova-dhcpbridge @@ -110,7 +110,6 @@ def main(): FLAGS.num_networks = 5 path = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', - '_trial_temp', 'nova.sqlite')) FLAGS.sql_connection = 'sqlite:///%s' % path action = argv[1] |