summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMotoKen <motokentsai@gmail.com>2012-04-09 10:33:55 +0800
committerMotoKen <motokentsai@gmail.com>2012-04-09 10:46:54 +0800
commit0f7db908f9d18b0d2fef30af09a53018b130394a (patch)
tree60bc3fd717ffa0ad37c3eef568f6929b9557c780
parent5f5295b884f456033d742d08388862615ff3b82b (diff)
Fixes bug 952176
Checks if value is string or not before decode. Change-Id: I3f839770fdd7b00223ce02b95b2a265d903fa00e
-rwxr-xr-xbin/nova-manage4
1 files changed, 3 insertions, 1 deletions
diff --git a/bin/nova-manage b/bin/nova-manage
index c0009bc24..f5491bccb 100755
--- 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]