Permalink
Browse files

Merge branch 'master' into adys-threaded-multipart

  • Loading branch information...
2 parents 8031016 + 2933252 commit 92ba05ad7bf9847d2f6c7bee9c2c73ee054bbd8b @mludvig mludvig committed Jan 2, 2012
Showing with 3 additions and 1 deletion.
  1. +2 −0 NEWS
  2. +1 −1 run-tests.py
View
2 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
View
2 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

0 comments on commit 92ba05a

Please sign in to comment.