From: <lu...@us...> - 2008-06-27 05:12:28
|
Revision: 200 http://s3tools.svn.sourceforge.net/s3tools/?rev=200&view=rev Author: ludvigm Date: 2008-06-26 22:12:24 -0700 (Thu, 26 Jun 2008) Log Message: ----------- * run-tests.sh: Sort-of testsuite Modified Paths: -------------- s3cmd/trunk/ChangeLog Added Paths: ----------- s3cmd/trunk/run-tests.sh Modified: s3cmd/trunk/ChangeLog =================================================================== --- s3cmd/trunk/ChangeLog 2008-06-23 05:36:16 UTC (rev 199) +++ s3cmd/trunk/ChangeLog 2008-06-27 05:12:24 UTC (rev 200) @@ -1,3 +1,7 @@ +2008-06-27 Michal Ludvig <mi...@lo...> + + * run-tests.sh: Sort-of testsuite + 2008-06-23 Michal Ludvig <mi...@lo...> * Released version 0.9.8 Added: s3cmd/trunk/run-tests.sh =================================================================== --- s3cmd/trunk/run-tests.sh (rev 0) +++ s3cmd/trunk/run-tests.sh 2008-06-27 05:12:24 UTC (rev 200) @@ -0,0 +1,39 @@ +#!/bin/sh +set -e -x + +./s3cmd mb s3://s3cmd-autotest +./s3cmd ls s3://s3cmd-autotest +./s3cmd put s3cmd s3cmd.1 s3://s3cmd-autotest +./s3cmd ls s3://s3cmd-autotest +./s3cmd del s3://s3cmd-autotest/s3cmd.1 +./s3cmd get s3://s3cmd-autotest/s3cmd s3cmd.get +diff s3cmd s3cmd.get +rm -fv s3cmd.get + +echo; echo +echo "=== Now running 'sync' tests ===" +echo; echo + +VER=$(./s3cmd --version | cut -d\ -f3) +tar xvfz dist/s3cmd-${VER}.tar.gz +echo "Will be removed" > s3cmd-${VER}/file.to.remove +./s3cmd sync s3cmd-${VER} s3://s3cmd-autotest/sync-test +echo "Added file" > s3cmd-${VER}/added.file +rm -f s3cmd-${VER}/file.to.remove +./s3cmd sync --delete s3cmd-${VER} s3://s3cmd-autotest/sync-test +rm -rf s3cmd-${VER} + +./s3cmd rb s3://s3cmd-autotest/ || true +# ERROR: S3 error: 409 (Conflict): BucketNotEmpty + +# hack to remove all objects from a bucket +mkdir empty +./s3cmd sync --delete empty/ s3://s3cmd-autotest +rm -rf empty + +./s3cmd rb s3://s3cmd-autotest/ + +echo; echo +echo; echo +echo "=== All good. Ready for release :-) ===" +echo Property changes on: s3cmd/trunk/run-tests.sh ___________________________________________________________________ Name: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2008-06-27 05:23:38
|
Revision: 201 http://s3tools.svn.sourceforge.net/s3tools/?rev=201&view=rev Author: ludvigm Date: 2008-06-26 22:23:37 -0700 (Thu, 26 Jun 2008) Log Message: ----------- * s3cmd: make 'cfg' global Modified Paths: -------------- s3cmd/trunk/ChangeLog s3cmd/trunk/s3cmd Modified: s3cmd/trunk/ChangeLog =================================================================== --- s3cmd/trunk/ChangeLog 2008-06-27 05:12:24 UTC (rev 200) +++ s3cmd/trunk/ChangeLog 2008-06-27 05:23:37 UTC (rev 201) @@ -1,5 +1,6 @@ 2008-06-27 Michal Ludvig <mi...@lo...> + * s3cmd: make 'cfg' global * run-tests.sh: Sort-of testsuite 2008-06-23 Michal Ludvig <mi...@lo...> Modified: s3cmd/trunk/s3cmd =================================================================== --- s3cmd/trunk/s3cmd 2008-06-27 05:12:24 UTC (rev 200) +++ s3cmd/trunk/s3cmd 2008-06-27 05:23:37 UTC (rev 201) @@ -554,8 +554,7 @@ for k in attrs: result += "%s:%s/" % (k, attrs[k]) return { 'x-amz-meta-s3cmd-attrs' : result[:-1] } - cfg = Config() - s3 = S3(cfg) + s3 = S3(Config()) src_uri = S3Uri(src) dst_uri = S3Uri(dst) @@ -850,6 +849,7 @@ return "" def main(): + global cfg if float("%d.%d" %(sys.version_info[0], sys.version_info[1])) < 2.4: sys.stderr.write("ERROR: Python 2.4 or higher required, sorry.\n") sys.exit(1) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2008-06-27 05:26:30
|
Revision: 203 http://s3tools.svn.sourceforge.net/s3tools/?rev=203&view=rev Author: ludvigm Date: 2008-06-26 22:26:28 -0700 (Thu, 26 Jun 2008) Log Message: ----------- * S3/PkgInfo.py: Bumped up version to 0.9.8.1 * NEWS: Added 0.9.8.1 Modified Paths: -------------- s3cmd/trunk/ChangeLog s3cmd/trunk/NEWS s3cmd/trunk/S3/PkgInfo.py Modified: s3cmd/trunk/ChangeLog =================================================================== --- s3cmd/trunk/ChangeLog 2008-06-27 05:23:59 UTC (rev 202) +++ s3cmd/trunk/ChangeLog 2008-06-27 05:26:28 UTC (rev 203) @@ -1,5 +1,12 @@ 2008-06-27 Michal Ludvig <mi...@lo...> + * Released version 0.9.8.1 + ------------------------ + +2008-06-27 Michal Ludvig <mi...@lo...> + + * S3/PkgInfo.py: Bumped up version to 0.9.8.1 + * NEWS: Added 0.9.8.1 * s3cmd: make 'cfg' global * run-tests.sh: Sort-of testsuite Modified: s3cmd/trunk/NEWS =================================================================== --- s3cmd/trunk/NEWS 2008-06-27 05:23:59 UTC (rev 202) +++ s3cmd/trunk/NEWS 2008-06-27 05:26:28 UTC (rev 203) @@ -1,3 +1,7 @@ +s3cmd 0.9.8.1 - 2008-06-27 +============= +* Bugfix release. Fixed 'mb' and 'rb' commands again. + s3cmd 0.9.8 - 2008-06-23 =========== * Added --exclude / --rexclude options for sync command. Modified: s3cmd/trunk/S3/PkgInfo.py =================================================================== --- s3cmd/trunk/S3/PkgInfo.py 2008-06-27 05:23:59 UTC (rev 202) +++ s3cmd/trunk/S3/PkgInfo.py 2008-06-27 05:26:28 UTC (rev 203) @@ -1,5 +1,5 @@ package = "s3cmd" -version = "0.9.8" +version = "0.9.8.1" url = "http://s3tools.logix.cz" license = "GPL version 2" short_description = "S3cmd is a tool for managing Amazon S3 storage space." This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
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. |
From: <lu...@us...> - 2008-07-03 12:24:17
|
Revision: 205 http://s3tools.svn.sourceforge.net/s3tools/?rev=205&view=rev Author: ludvigm Date: 2008-07-03 05:24:15 -0700 (Thu, 03 Jul 2008) Log Message: ----------- * s3cmd: Print version info on 'unexpected error' output. Modified Paths: -------------- s3cmd/trunk/ChangeLog s3cmd/trunk/s3cmd Modified: s3cmd/trunk/ChangeLog =================================================================== --- s3cmd/trunk/ChangeLog 2008-06-30 13:38:12 UTC (rev 204) +++ s3cmd/trunk/ChangeLog 2008-07-03 12:24:15 UTC (rev 205) @@ -1,3 +1,7 @@ +2008-07-03 Michal Ludvig <mi...@lo...> + + * s3cmd: Print version info on 'unexpected error' output. + 2008-06-30 Michal Ludvig <mi...@lo...> * S3/S3.py: Re-upload when Amazon doesn't send ETag Modified: s3cmd/trunk/s3cmd =================================================================== --- s3cmd/trunk/s3cmd 2008-06-30 13:38:12 UTC (rev 204) +++ s3cmd/trunk/s3cmd 2008-07-03 12:24:15 UTC (rev 205) @@ -1051,6 +1051,9 @@ !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! """) + sys.stderr.write("S3cmd: %s\n" % PkgInfo.version) + sys.stderr.write("Python: %s\n" % sys.version.replace('\n', ' ')) + sys.stderr.write("\n") sys.stderr.write(traceback.format_exc(sys.exc_info())+"\n") sys.stderr.write(""" !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2008-07-03 12:26:10
|
Revision: 206 http://s3tools.svn.sourceforge.net/s3tools/?rev=206&view=rev Author: ludvigm Date: 2008-07-03 05:26:03 -0700 (Thu, 03 Jul 2008) Log Message: ----------- * S3/PkgInfo.py: Bumped up version to 0.9.8.2 * NEWS: Added 0.9.8.2 Modified Paths: -------------- s3cmd/trunk/ChangeLog s3cmd/trunk/NEWS s3cmd/trunk/S3/PkgInfo.py Modified: s3cmd/trunk/ChangeLog =================================================================== --- s3cmd/trunk/ChangeLog 2008-07-03 12:24:15 UTC (rev 205) +++ s3cmd/trunk/ChangeLog 2008-07-03 12:26:03 UTC (rev 206) @@ -1,5 +1,12 @@ 2008-07-03 Michal Ludvig <mi...@lo...> + * Released version 0.9.8.2 + ------------------------ + +2008-07-03 Michal Ludvig <mi...@lo...> + + * S3/PkgInfo.py: Bumped up version to 0.9.8.2 + * NEWS: Added 0.9.8.2 * s3cmd: Print version info on 'unexpected error' output. 2008-06-30 Michal Ludvig <mi...@lo...> Modified: s3cmd/trunk/NEWS =================================================================== --- s3cmd/trunk/NEWS 2008-07-03 12:24:15 UTC (rev 205) +++ s3cmd/trunk/NEWS 2008-07-03 12:26:03 UTC (rev 206) @@ -1,3 +1,8 @@ +s3cmd 0.9.8.2 - 2008-06-27 +============= +* Bugfix release. Re-upload file if Amazon doesn't send ETag + back. + s3cmd 0.9.8.1 - 2008-06-27 ============= * Bugfix release. Fixed 'mb' and 'rb' commands again. Modified: s3cmd/trunk/S3/PkgInfo.py =================================================================== --- s3cmd/trunk/S3/PkgInfo.py 2008-07-03 12:24:15 UTC (rev 205) +++ s3cmd/trunk/S3/PkgInfo.py 2008-07-03 12:26:03 UTC (rev 206) @@ -1,5 +1,5 @@ package = "s3cmd" -version = "0.9.8.1" +version = "0.9.8.2" url = "http://s3tools.logix.cz" license = "GPL version 2" short_description = "S3cmd is a tool for managing Amazon S3 storage space." This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2008-07-07 09:50:26
|
Revision: 207 http://s3tools.svn.sourceforge.net/s3tools/?rev=207&view=rev Author: ludvigm Date: 2008-07-07 02:50:24 -0700 (Mon, 07 Jul 2008) Log Message: ----------- * s3cmd.1: couple of syntax fixes from Mikhail Gusarov Modified Paths: -------------- s3cmd/trunk/ChangeLog s3cmd/trunk/s3cmd.1 Modified: s3cmd/trunk/ChangeLog =================================================================== --- s3cmd/trunk/ChangeLog 2008-07-03 12:26:03 UTC (rev 206) +++ s3cmd/trunk/ChangeLog 2008-07-07 09:50:24 UTC (rev 207) @@ -1,3 +1,7 @@ +2008-07-07 Michal Ludvig <mi...@lo...> + + * s3cmd.1: couple of syntax fixes from Mikhail Gusarov + 2008-07-03 Michal Ludvig <mi...@lo...> * Released version 0.9.8.2 Modified: s3cmd/trunk/s3cmd.1 =================================================================== --- s3cmd/trunk/s3cmd.1 2008-07-03 12:26:03 UTC (rev 206) +++ s3cmd/trunk/s3cmd.1 2008-07-07 09:50:24 UTC (rev 207) @@ -162,8 +162,8 @@ to corresponding paths under s3://test-bucket/backup on the remote side. For example: .nf -/local/path\fB/file1.ext\fR -> s3://test-bucket/backup\fB/file1.ext\fR -/local/path\fB/dir123/file2.bin\fR -> s3://test-bucket/backup\fB/dir123/file2.bin\fR +/local/path\fB/file1.ext\fR \-> s3://test-bucket/backup\fB/file1.ext\fR +/local/path\fB/dir123/file2.bin\fR \-> s3://test-bucket/backup\fB/dir123/file2.bin\fR .fi To retrieve the files back from S3 use inverted syntax: @@ -172,13 +172,13 @@ .fi that will download files: .nf -s3://test-bucket/backup\fB/file1.ext\fR -> /tmp/restore\fB/file1.ext\fR -s3://test-bucket/backup\fB/dir123/file2.bin\fR -> /tmp/restore\fB/dir123/file2.bin\fR +s3://test-bucket/backup\fB/file1.ext\fR \-> /tmp/restore\fB/file1.ext\fR +s3://test-bucket/backup\fB/dir123/file2.bin\fR \-> /tmp/restore\fB/dir123/file2.bin\fR .fi For the purpose of \fB\-\-exclude\fR and \fB\-\-exclude\-from\fR matching the file name \fIalways\fR begins with \fB/\fR (slash) and has the local or remote common part removed. -For instance in the previous example the file names tested against --exclude list +For instance in the previous example the file names tested against \-\-exclude list will be \fB/\fRfile1.ext and \fB/\fRdir123/file2.bin, that is both with the leading slash regardless whether you specified s3://test-bucket/backup or s3://test-bucket/backup/ (note the trailing slash) on the command line. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |