Browse code

Merge branch 'master' into adys-threaded-multipart

Michal Ludvig authored on 2012/01/02 22:30:41
Showing 2 changed files
... ...
@@ -6,6 +6,8 @@ s3cmd 1.1.0   -   ???
6 6
   (contributed by Jens Braeuer)
7 7
 * Force MIME type with --mime-type=abc/xyz, also --guess-mime-type 
8 8
   is no longer on by default.
9
+* Allow parameters in MIME types, for example:
10
+  --mime-type="text/plain; charset=utf-8"
9 11
 * Support for environment variables as config values. For instance
10 12
   in ~/.s3cmd put "access_key=$S3_ACCESS_KEY". Contributed by Ori Bar.
11 13
 * Support for --configure checking access to a specific bucket instead
... ...
@@ -432,7 +432,7 @@ test_rmdir("Remove dst dir for get", "testsuite-out")
432 432
 ## ====== Get multiple files
433 433
 test_s3cmd("Get multiple files", ['get', '%s/xyz/etc2/Logo.PNG' % pbucket(1), '%s/xyz/etc/AtomicClockRadio.ttf' % pbucket(1), 'testsuite-out'],
434 434
     retcode = 1,
435
-    must_find = [ 'Destination must be a directory when downloading multiple sources.' ])
435
+    must_find = [ 'Destination must be a directory or stdout when downloading multiple sources.' ])
436 436
 
437 437
 
438 438
 ## ====== Make dst dir for get