@@ -865,10 +865,10 @@ def cmd_sync_remote2local(args):

     seq, total_size = _download(remote_list, seq, remote_count + update_count, total_size, dir_cache)

     seq, total_size = _download(update_list, seq, remote_count + update_count, total_size, dir_cache)

-    failed_hardlink_list = local_hardlink(copy_pairs, destination_base)

-    _set_local_filename(failed_hardlink_list, destination_base)

-    seq, total_size = _download(failed_hardlink_list, seq, len(failed_hardlink_list) + remote_count + update_count, total_size, dir_cache)

-    

+    failed_copy_list = local_copy(copy_pairs, destination_base)

+    _set_local_filename(failed_copy_list, destination_base)

+    seq, total_size = _download(failed_copy_list, seq, len(failed_copy_list) + remote_count + update_count, total_size, dir_cache)

+

     total_elapsed = time.time() - timestamp_start

     speed_fmt = formatSize(total_size/total_elapsed, human_readable = True, floating_point = True)

@@ -883,22 +883,25 @@ def cmd_sync_remote2local(args):

     if cfg.delete_removed and cfg.delete_after:

         _do_deletes(local_list)

-def local_hardlink(copy_pairs, destination_base):

-    failed_hardlink_list = SortedDict()

+def local_copy(copy_pairs, destination_base):

+    # Do NOT hardlink local files by default, that'd be silly

+    # For instance all empty files would become hardlinked together!

+

+    failed_copy_list = SortedDict()

     for (src_obj, dst1, relative_file) in copy_pairs:

         src_file = os.path.join(destination_base, dst1)

         dst_file = os.path.join(destination_base, relative_file)

+        dst_dir = os.path.dirname(dst_file)

         try:

-            os.link(src_file, dst_file)

-            debug(u"Hardlinking %s to %s" % (src_file, dst_file))

-        except (IOError, OSError):

-            try:

-                shutil.copy2(src_file, dst_file)

-                debug(u"Hardlinking unavailable, copying %s to %s" % (src_file, dst_file))

-            except IOError, e:

-                warning(u'Unable to hardlink or copy files %s -> %s: %s' % (src_file, dst_file, e))

-                failed_hardlink_list[relative_file] = src_obj

-    return failed_hardlink_list

+            if not os.path.isdir(dst_dir):

+                debug("MKDIR %s" % dst_dir)

+                os.makedirs(dst_dir)

+            debug(u"Copying %s to %s" % (src_file, dst_file))

+            shutil.copy2(src_file, dst_file)

+        except (IOError, OSError), e:

+            warning(u'Unable to hardlink or copy files %s -> %s: %s' % (src_file, dst_file, e))

+            failed_copy_list[relative_file] = src_obj

+    return failed_copy_list

 def remote_copy(s3, copy_pairs, destination_base):

     saved_bytes = 0