Merge "Fixes bug 952176"

2012-04-09 16:53:33 +00:00 · 2012-04-09 16:53:33 +00:00 · 1c47d8a9cf
commit 1c47d8a9cf
parent 21dbbaa386 0f7db908f9
1 changed files with 3 additions and 1 deletions
--- a/bin/nova-manage
+++ b/bin/nova-manage
@ -1721,8 +1721,10 @@ def main():
    for k, v in fn_kwargs.items():
        if v is None:
            del fn_kwargs[k]
-        else:
+        elif isinstance(v, basestring):
            fn_kwargs[k] = v.decode('utf-8')
+        else:
+            fn_kwargs[k] = v

    fn_args = [arg.decode('utf-8') for arg in fn_args]