@@ -1,5 +1,8 @@

 2008-11-06  Michal Ludvig  <michal@logix.cz>

+	* S3/S3.py: Adjusting commit 249 - it's not a good idea to retry ALL failures.

+	  Especially not those code=4xx where AmazonS3 servers are not happy with our

+	  requests.

 	* run-tests.sh: Use unique bucket name for testing. Apparently someone 

 	  else snatched my favourite s3://s3cmd-autotest :-D

@@ -316,9 +316,9 @@ class S3(object):

 			response["data"] =  http_response.read()

 			debug("Response: " + str(response))

 			conn.close()

-		except Exception:

+		except Exception, e:

 			if retries:

-				warning("Retrying failed request: %s" % resource['uri'])

+				warning("Retrying failed request: %s (%s)" % (resource['uri'], e))

 				return self.send_request(request, body, retries - 1)

 			else:

 				raise S3RequestError("Request failed for: %s" % resource['uri'])

@@ -331,12 +331,18 @@ class S3(object):

 			info("Redirected to: %s" % (redir_hostname))

 			return self.send_request(request, body)

-		if response["status"] < 200 or response["status"] > 299:

+		if response["status"] >= 500:

+			e = S3Error(response)

 			if retries:

-				warning("Retrying failed request: %s" % resource['uri'])

+				warning(u"Retrying failed request: %s" % resource['uri'])

+				warning(unicode(e))

 				return self.send_request(request, body, retries - 1)

 			else:

-				raise S3Error(response)

+				raise e

+

+		if response["status"] < 200 or response["status"] > 299:

+			raise S3Error(response)

+

 		return response

 	def send_file(self, request, file, throttle = 0, retries = 3):