Permalink
Browse files

Merge remote-tracking branch 'mattswe/patch-1' into mattswe-merge

  • Loading branch information...
mdomsch committed Jul 14, 2012
2 parents f61f912 + 5b432a5 commit 27851d4cc260081c6c8dab3f9770db0ed2bd527b
Showing with 2 additions and 0 deletions.
  1. +2 −0 s3cmd
View
2 s3cmd
@@ -1675,6 +1675,8 @@ def main():
optparser.add_option( "--configure", dest="run_configure", action="store_true", help="Invoke interactive (re)configuration tool. Optionally use as '--configure s3://come-bucket' to test access to a specific bucket instead of attempting to list them all.")
optparser.add_option("-c", "--config", dest="config", metavar="FILE", help="Config file name. Defaults to %default")
optparser.add_option( "--dump-config", dest="dump_config", action="store_true", help="Dump current configuration after parsing config files and command line options and exit.")
+ optparser.add_option( "--access_key", dest="access_key", help="AWS Access Key")
+ optparser.add_option( "--secret_key", dest="secret_key", help="AWS Secret Key")
optparser.add_option("-n", "--dry-run", dest="dry_run", action="store_true", help="Only show what should be uploaded or downloaded but don't actually do it. May still perform S3 requests to get bucket listings and other information though (only for file transfer commands)")

0 comments on commit 27851d4

Please sign in to comment.