git-svn-id: https://s3tools.svn.sourceforge.net/svnroot/s3tools/s3cmd/trunk@463 830e0280-6d2a-0410-9c65-932aecc39d9d
| ... | ... |
@@ -1,5 +1,7 @@ |
| 1 | 1 |
2011-01-02 Michal Ludvig <mludvig@logix.net.nz> |
| 2 | 2 |
|
| 3 |
+ * s3cmd: Improved r457 (Don't crash when file disappears |
|
| 4 |
+ before checking MD5). |
|
| 3 | 5 |
* s3cmd, s3cmd.1, format-manpage.pl: Improved --help text |
| 4 | 6 |
and manpage. |
| 5 | 7 |
* s3cmd: Removed explicit processing of --follow-symlinks |
| ... | ... |
@@ -816,7 +816,7 @@ def _compare_filelists(src_list, dst_list, src_remote, dst_remote): |
| 816 | 816 |
elif src_remote == True and dst_remote == True: |
| 817 | 817 |
src_md5 = src_list[file]['md5'] |
| 818 | 818 |
dst_md5 = dst_list[file]['md5'] |
| 819 |
- except: |
|
| 819 |
+ except (IOError,OSError), e: |
|
| 820 | 820 |
# MD5 sum verification failed - ignore that file altogether |
| 821 | 821 |
debug(u"IGNR: %s (disappeared)" % (file)) |
| 822 | 822 |
warning(u"%s: file disappeared, ignoring." % (file)) |