From: <lu...@us...> - 2008-06-30 13:38:14
|
Revision: 204 http://s3tools.svn.sourceforge.net/s3tools/?rev=204&view=rev Author: ludvigm Date: 2008-06-30 06:38:12 -0700 (Mon, 30 Jun 2008) Log Message: ----------- * S3/S3.py: Re-upload when Amazon doesn't send ETag in PUT response. It happens from time to time for unknown reasons. Thanks "Burtc" for report and "hermzz" for fix. Fixes #1990387 Modified Paths: -------------- s3cmd/trunk/ChangeLog s3cmd/trunk/S3/S3.py Modified: s3cmd/trunk/ChangeLog =================================================================== --- s3cmd/trunk/ChangeLog 2008-06-27 05:26:28 UTC (rev 203) +++ s3cmd/trunk/ChangeLog 2008-06-30 13:38:12 UTC (rev 204) @@ -1,3 +1,10 @@ +2008-06-30 Michal Ludvig <mi...@lo...> + + * S3/S3.py: Re-upload when Amazon doesn't send ETag + in PUT response. It happens from time to time for + unknown reasons. Thanks "Burtc" for report and + "hermzz" for fix. + 2008-06-27 Michal Ludvig <mi...@lo...> * Released version 0.9.8.1 Modified: s3cmd/trunk/S3/S3.py =================================================================== --- s3cmd/trunk/S3/S3.py 2008-06-27 05:26:28 UTC (rev 203) +++ s3cmd/trunk/S3/S3.py 2008-06-30 13:38:12 UTC (rev 204) @@ -381,6 +381,11 @@ info("Redirected to: %s" % (redir_hostname)) return self.send_file(request, file) + # S3 from time to time doesn't send ETag back in a response :-( + # Force re-upload here. + if not response['headers'].has_key('etag'): + response['headers']['etag'] = '' + debug("MD5 sums: computed=%s, received=%s" % (md5_computed, response["headers"]["etag"])) if response["headers"]["etag"].strip('"\'') != md5_hash.hexdigest(): warning("MD5 Sums don't match!") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |