[Python-apps-commits] r9805 - in packages/s3cmd/trunk/debian (3 files)

[stefanor at users.alioth.debian.org]

    Date: Thursday, June 27, 2013 @ 13:37:27
  Author: stefanor
Revision: 9805

* Team upload.
* Fix crash in multi-part uploads (Closes: #683558, LP: #1188160)

Added:
  packages/s3cmd/trunk/debian/patches/multipart-upload-elapsed-time.patch
Modified:
  packages/s3cmd/trunk/debian/changelog
  packages/s3cmd/trunk/debian/patches/series

Modified: packages/s3cmd/trunk/debian/changelog
===================================================================
--- packages/s3cmd/trunk/debian/changelog	2013-06-26 19:14:55 UTC (rev 9804)
+++ packages/s3cmd/trunk/debian/changelog	2013-06-27 13:37:27 UTC (rev 9805)
@@ -1,9 +1,14 @@
-s3cmd (1.1.0~beta3-2) UNRELEASED; urgency=low
+s3cmd (1.1.0~beta3-2) unstable; urgency=low
 
+  [ Jakub Wilk ]
   * Use canonical URIs for Vcs-* fields.
 
- -- Jakub Wilk <jwilk at debian.org>  Sun, 05 May 2013 18:05:43 +0200
+  [ Stefano Rivera ]
+  * Team upload.
+  * Fix crash in multi-part uploads (Closes: #683558, LP: #1188160)
 
+ -- Stefano Rivera <stefanor at debian.org>  Thu, 27 Jun 2013 14:25:05 +0200
+
 s3cmd (1.1.0~beta3-1) unstable; urgency=low
 
   * New upstream release:

Added: packages/s3cmd/trunk/debian/patches/multipart-upload-elapsed-time.patch
===================================================================
--- packages/s3cmd/trunk/debian/patches/multipart-upload-elapsed-time.patch	                        (rev 0)
+++ packages/s3cmd/trunk/debian/patches/multipart-upload-elapsed-time.patch	2013-06-27 13:37:27 UTC (rev 9805)
@@ -0,0 +1,27 @@
+Description: Compute speed and elapsed time for Multipart uploads
+ Fixes a crash with:
+  s3cmd put /xyz/big-file s3://bucket/ > /dev/null
+Author: Michal Ludvig <mludvig at logix.net.nz>
+Origin: Upstream, https://github.com/s3tools/s3cmd/commit/9c57a3ba2163915deb2cc63cefa885a66ac377ab
+Bug-Debian: http://bugs.debian.org/683558
+Bug-Upstream: https://github.com/s3tools/s3cmd/issues/24
+Last-Updated: 2013-06-27
+
+--- a/S3/S3.py
++++ b/S3/S3.py
+@@ -752,11 +752,14 @@
+ 
+     def send_file_multipart(self, file, headers, uri, size):
+         chunk_size = self.config.multipart_chunk_size_mb * 1024 * 1024
++        timestamp_start = time.time()
+         upload = MultiPartUpload(self, file, uri, headers)
+         upload.upload_all_parts()
+         response = upload.complete_multipart_upload()
+-        response["speed"] = 0 # XXX
++        timestamp_end = time.time()
++        response["elapsed"] = timestamp_end - timestamp_start
+         response["size"] = size
++        response["speed"] = response["elapsed"] and float(response["size"]) / response["elapsed"] or float(-1)
+         return response
+ 
+     def recv_file(self, request, stream, labels, start_position = 0, retries = _max_retries):

Modified: packages/s3cmd/trunk/debian/patches/series
===================================================================
--- packages/s3cmd/trunk/debian/patches/series	2013-06-26 19:14:55 UTC (rev 9804)
+++ packages/s3cmd/trunk/debian/patches/series	2013-06-27 13:37:27 UTC (rev 9805)
@@ -1,2 +1,3 @@
 do-not-check-elementtree-at-build-time.patch
 fix-manpage-typos.patch
+multipart-upload-elapsed-time.patch