summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xplugins/xenserver/xenapi/etc/xapi.d/plugins/migration6
1 files changed, 4 insertions, 2 deletions
diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/migration b/plugins/xenserver/xenapi/etc/xapi.d/plugins/migration
index 1e1fe0f5e..48436f5f3 100755
--- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/migration
+++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/migration
@@ -112,8 +112,10 @@ def transfer_vhd(session, args):
ssh_cmd = '\"ssh -o StrictHostKeyChecking=no\"'
- rsync_args = shlex.split('nohup /usr/bin/rsync -av -e %s %s %s'
- % (ssh_cmd, source_path, dest_path))
+ # NOTE(dprince): shlex python 2.4 doesn't like unicode so we
+ # explicitly convert to ascii
+ rsync_args = shlex.split(('nohup /usr/bin/rsync -av -e %s %s %s'
+ % (ssh_cmd, source_path, dest_path)).encode('ascii'))
logging.debug('rsync %s' % (' '.join(rsync_args, )))