Skip to content
This repository
Browse code

Merge branch 'master' into adys-threaded-multipart

  • Loading branch information...
commit 92ba05ad7bf9847d2f6c7bee9c2c73ee054bbd8b 2 parents 8031016 + 2933252
Michal Ludvig mludvig authored

Showing 2 changed files with 3 additions and 1 deletion. Show diff stats Hide diff stats

  1. +2 0  NEWS
  2. +1 1  run-tests.py
2  NEWS
@@ -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
2  run-tests.py
@@ -432,7 +432,7 @@ def pbucket(tail):
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

0 comments on commit 92ba05a

Please sign in to comment.
Something went wrong with that request. Please try again.