diff --git a/bin/boto-rsync b/bin/boto-rsync old mode 100644 new mode 100755 index 76278b2..97bc5fb --- a/bin/boto-rsync +++ b/bin/boto-rsync @@ -484,6 +484,8 @@ def main(): else: key_name = cloud_path + get_key_name(root, path) + '/' + key_name = key_name.decode('utf-8') + if ignore_empty and not files: if not quiet: sys.stdout.write( @@ -539,7 +541,7 @@ def main(): continue fullpath = os.path.join(root, file) - key_name = cloud_path + get_key_name(fullpath, path) + key_name = (cloud_path + get_key_name(fullpath, path)).decode('utf-8') file_size = os.path.getsize(fullpath) if file_size == 0: @@ -566,7 +568,7 @@ def main(): fullpath[len(path):].lstrip(os.sep) ) continue - + sys.stdout.write( '%s\n' % fullpath[len(path):].lstrip(os.sep) @@ -607,6 +609,7 @@ def main(): for file in files: fullpath = os.path.join(root, file) key_name = cloud_path + get_key_name(fullpath, path) + key_name = key_name.decode('utf-8') if key_name in keys: del(keys[key_name]) @@ -618,6 +621,7 @@ def main(): key_name = cloud_path + get_key_name(root, path) + \ '/' + key_name = key_name.decode('utf-8') if key_name in keys: del(keys[key_name])