Browse code

really merge @edrex https://github.com/s3tools/s3cmd/pull/244

Matt Domsch authored on 2013/11/26 13:55:26
Showing 1 changed files
... ...
@@ -1944,7 +1944,7 @@ def main():
1944 1944
     optparser.add_option(      "--access-logging-target-prefix", dest="log_target_prefix", help="Target prefix for access logs (S3 URI) (for [cfmodify] and [accesslog] commands)")
1945 1945
     optparser.add_option(      "--no-access-logging", dest="log_target_prefix", action="store_false", help="Disable access logging (for [cfmodify] and [accesslog] commands)")
1946 1946
 
1947
-    optparser.add_option(      "--default-mime-type", dest="default_mime_type", action="store", help="Default MIME-type for stored objects. Application default is binary/octet-stream.")
1947
+    optparser.add_option(      "--default-mime-type", dest="default_mime_type", type="mimetype", action="store", help="Default MIME-type for stored objects. Application default is binary/octet-stream.")
1948 1948
     optparser.add_option("-M", "--guess-mime-type", dest="guess_mime_type", action="store_true", help="Guess MIME-type of files by their extension or mime magic. Fall back to default MIME-Type as specified by --default-mime-type option")
1949 1949
     optparser.add_option(      "--no-guess-mime-type", dest="guess_mime_type", action="store_false", help="Don't guess MIME-type and use the default type instead.")
1950 1950
     optparser.add_option(      "--no-mime-magic", dest="use_mime_magic", action="store_false", help="Don't use mime magic when guessing MIME-type.")