@@ -428,7 +428,7 @@ def compare_filelists(src_list, dst_list, src_remote, dst_remote, delay_updates

                     # Found one, we want to copy

                     dst1 = list(dst_list.by_md5[md5])[0]

                     debug(u"REMOTE COPY src: %s -> %s" % (dst1, relative_file))

-		    copy_pairs.append((dst_list[dst1], relative_file))

+		    copy_pairs.append((dst1, relative_file))

 		    del(src_list[relative_file])

 		    del(dst_list[relative_file])

                 else:

@@ -448,7 +448,8 @@ def compare_filelists(src_list, dst_list, src_remote, dst_remote, delay_updates

 	    if dst1 is not None:

                 # Found one, we want to copy

                 debug(u"REMOTE COPY dst: %s -> %s" % (dst1, relative_file))

-		copy_pairs.append((dst_list[dst1], relative_file))

+		# FIXME this blows up when dst1 is not in dst_list, because we added it below in record_md5 but it's not really in dst_list.

+		copy_pairs.append((dst1, relative_file))

 		del(src_list[relative_file])

 	    else:

                 # we don't have this file, and we don't have a copy of this file elsewhere.  Get it.

@@ -845,11 +845,13 @@ def remote_copy(s3, remote_list, copy_pairs, destination_base):

     saved_bytes = 0

     for (dst1, dst2) in copy_pairs:

         debug(u"Remote Copying from %s to %s" % (dst1, dst2))

-        dst_uri = S3Uri(destination_base + dst2)

+        dst1_uri = S3Uri(destination_base + dst1)

+        dst2_uri = S3Uri(destination_base + dst2)

         extra_headers = copy(cfg.extra_headers)

         try:

-            s3.object_copy(S3Uri(dst1['object_uri_str']), dst_uri, extra_headers)

-            saved_bytes = saved_bytes + dst1['size']

+            s3.object_copy(dst1_uri, dst2_uri, extra_headers)

+            info = s3.object_info(dst2_uri)

+            saved_bytes = saved_bytes + int(info['headers']['content-length'])

         except:

             raise

     return (len(copy_pairs), saved_bytes)