@@ -1,5 +1,9 @@

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

+	Merge from 0.9.8.x branch, rel 246:

+	* s3cmd, S3/S3.py, S3/Exceptions.py: Don't abort 'sync' or 'put' on files

+	  that can't be open (e.g. Permision denied). Print a warning and skip over

+	  instead.

 	Merge from 0.9.8.x branch, rel 245:

 	* S3/S3.py: Escape parameters in strings. Fixes sync to and 

 	  ls of directories with spaces. (Thx Lubomir Rintel from Fedora Project)

@@ -48,5 +48,8 @@ class S3UploadError(S3Exception):

 class S3DownloadError(S3Exception):

 	pass

+class InvalidFileError(S3Exception):

+	pass

+

 class ParameterError(S3Exception):

 	pass

@@ -162,12 +162,12 @@ class S3(object):

 			raise ValueError("Expected URI type 's3', got '%s'" % uri.type)

 		if not os.path.isfile(filename):

-			raise ParameterError("%s is not a regular file" % filename)

+			raise InvalidFileError("%s is not a regular file" % filename)

 		try:

 			file = open(filename, "rb")

 			size = os.stat(filename)[ST_SIZE]

 		except IOError, e:

-			raise ParameterError("%s: %s" % (filename, e.strerror))

+			raise InvalidFileError("%s: %s" % (filename, e.strerror))

 		headers = SortedDict()

 		if extra_headers:

 			headers.update(extra_headers)

@@ -209,6 +209,9 @@ def cmd_object_put(args):

 		except S3UploadError, e:

 			error("Upload of '%s' failed too many times. Skipping that file." % real_filename)

 			continue

+		except InvalidFileError, e:

+			warning("File can not be uploaded: %s" % e)

+			continue

 		speed_fmt = formatSize(response["speed"], human_readable = True, floating_point = True)

 		output("File '%s' stored as %s (%d bytes in %0.1f seconds, %0.2f %sB/s) [%d of %d]" %

 			(file, uri_final, response["size"], response["elapsed"], speed_fmt[0], speed_fmt[1],

@@ -648,6 +651,9 @@ def cmd_sync_local2remote(src, dst):

 		except S3UploadError, e:

 			error("%s: upload failed too many times. Skipping that file." % src)

 			continue

+		except InvalidFileError, e:

+			warning("File can not be uploaded: %s" % e)

+			continue

 		speed_fmt = formatSize(response["speed"], human_readable = True, floating_point = True)

 		output("File '%s' stored as %s (%d bytes in %0.1f seconds, %0.2f %sB/s) [%d of %d]" %

 			(src, uri, response["size"], response["elapsed"], speed_fmt[0], speed_fmt[1],