diff options
| author | Anthony Young <sleepsonthefloor@gmail.com> | 2010-12-28 18:11:02 -0800 |
|---|---|---|
| committer | Anthony Young <sleepsonthefloor@gmail.com> | 2010-12-28 18:11:02 -0800 |
| commit | 4b5bd4b4a8db70c40180c745f9bfc33aa6572e09 (patch) | |
| tree | babb1bb8d1d3cf58bb74ce69813c6fcf46ec9751 /bin | |
| parent | 35638077a186f9315ac6e30cdbe096730a540ed8 (diff) | |
| parent | 71be236ef4a1fd956f7462ff236ff53d93fef2dc (diff) | |
| download | nova-4b5bd4b4a8db70c40180c745f9bfc33aa6572e09.tar.gz nova-4b5bd4b4a8db70c40180c745f9bfc33aa6572e09.tar.xz nova-4b5bd4b4a8db70c40180c745f9bfc33aa6572e09.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] |