Merge branch 'master' into adys-threaded-multipart

s3tools · Jan 2, 2012 · 92ba05a · 92ba05a
2 parents 8031016 + 2933252
commit 92ba05a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/NEWS b/NEWS
@@ -6,6 +6,8 @@ s3cmd 1.1.0   -   ???
   (contributed by Jens Braeuer)
 * Force MIME type with --mime-type=abc/xyz, also --guess-mime-type 
   is no longer on by default.
+* Allow parameters in MIME types, for example:
+  --mime-type="text/plain; charset=utf-8"
 * Support for environment variables as config values. For instance
   in ~/.s3cmd put "access_key=$S3_ACCESS_KEY". Contributed by Ori Bar.
 * Support for --configure checking access to a specific bucket instead

diff --git a/run-tests.py b/run-tests.py
@@ -432,7 +432,7 @@ def pbucket(tail):
 ## ====== Get multiple files
 test_s3cmd("Get multiple files", ['get', '%s/xyz/etc2/Logo.PNG' % pbucket(1), '%s/xyz/etc/AtomicClockRadio.ttf' % pbucket(1), 'testsuite-out'],
     retcode = 1,
-    must_find = [ 'Destination must be a directory when downloading multiple sources.' ])
+    must_find = [ 'Destination must be a directory or stdout when downloading multiple sources.' ])
 
 
 ## ====== Make dst dir for get