Browse code

info() reports "Disabled MD5 check for FILE" even if --check-no-md5 used. If statement is still true if file fails md5 check.

interra authored on 2012/02/23 04:19:11
Showing 1 changed files
... ...
@@ -304,9 +304,10 @@ def compare_filelists(src_list, dst_list, src_remote, dst_remote):
304 304
             ## Check MD5
305 305
             compare_md5 = 'md5' in cfg.sync_checks
306 306
             # Multipart-uploaded files don't have a valid MD5 sum - it ends with "...-NN"
307
-            if compare_md5 and (src_remote == True and src_list[file]['md5'].find("-") >= 0) or (dst_remote == True and dst_list[file]['md5'].find("-") >= 0):
308
-                compare_md5 = False
309
-                info(u"Disabled MD5 check for %s" % file)
307
+            if compare_md5:
308
+                if (src_remote == True and src_list[file]['md5'].find("-") >= 0) or (dst_remote == True and dst_list[file]['md5'].find("-") >= 0):
309
+                    compare_md5 = False
310
+                    info(u"Disabled MD5 check for %s" % file)
310 311
             if attribs_match and compare_md5:
311 312
                 try:
312 313
                     if src_remote == False and dst_remote == True: