@@ -1,5 +1,18 @@

-s3cmd 1.5.0   -   ???

-===========

+s3cmd 1.5.0-alpha3   -   2013-03-11

+==================

+* Persistent HTTP/HTTPS connections for massive speedup (Michal Ludvig)

+* New switch --quiet for suppressing all output (Siddarth Prakash)

+* Honour "umask" on file downloads (Jason Dalton)

+* Various bugfixes from many contributors

+

+s3cmd 1.5.0-alpha2   -   2013-03-04

+==================

+* IAM roles support (David Kohen, Eric Dowd)

+* Manage bucket policies (Kota Uenishi)

+* Various bugfixes from many contributors

+

+s3cmd 1.5.0-alpha1   -   2013-02-19

+==================

 * Server-side copy for hardlinks/softlinks to improve performance

   (Matt Domsch)

 * New [signurl] command (Craig Ringer)

new file mode 100644

@@ -0,0 +1,71 @@

+import httplib

+from urlparse import urlparse

+from threading import Semaphore

+from logging import debug, info, warning, error

+

+from Config import Config

+from Exceptions import ParameterError

+

+__all__ = [ "ConnMan" ]

+

+class http_connection(object):

+    def __init__(self, id, hostname, ssl, cfg):

+        self.hostname = hostname

+        self.ssl = ssl

+        self.id = id

+        self.counter = 0

+        if cfg.proxy_host != "":

+            self.c = httplib.HTTPConnection(cfg.proxy_host, cfg.proxy_port)

+        elif not ssl:

+            self.c = httplib.HTTPConnection(hostname)

+        else:

+            self.c = httplib.HTTPSConnection(hostname)

+

+class ConnMan(object):

+    conn_pool_sem = Semaphore()

+    conn_pool = {}

+    conn_max_counter = 800    ## AWS closes connection after some ~90 requests

+

+    @staticmethod

+    def get(hostname, ssl = None):

+        cfg = Config()

+        if ssl == None:

+            ssl = cfg.use_https

+        conn = None

+        if cfg.proxy_host != "":

+            if ssl:

+                raise ParameterError("use_ssl=True can't be used with proxy")

+            conn_id = "proxy://%s:%s" % (cfg.proxy_host, cfg.proxy_port)

+        else:

+            conn_id = "http%s://%s" % (ssl and "s" or "", hostname)

+        ConnMan.conn_pool_sem.acquire()

+        if not ConnMan.conn_pool.has_key(conn_id):

+            ConnMan.conn_pool[conn_id] = []

+        if len(ConnMan.conn_pool[conn_id]):

+            conn = ConnMan.conn_pool[conn_id].pop()

+            debug("ConnMan.get(): re-using connection: %s#%d" % (conn.id, conn.counter))

+        ConnMan.conn_pool_sem.release()

+        if not conn:

+            debug("ConnMan.get(): creating new connection: %s" % conn_id)

+            conn = http_connection(conn_id, hostname, ssl, cfg)

+            conn.c.connect()

+        conn.counter += 1

+        return conn

+

+    @staticmethod

+    def put(conn):

+        if conn.id.startswith("proxy://"):

+            conn.c.close()

+            debug("ConnMan.put(): closing proxy connection (keep-alive not yet supported)")

+            return

+

+        if conn.counter >= ConnMan.conn_max_counter:

+            conn.c.close()

+            debug("ConnMan.put(): closing over-used connection")

+            return

+

+        ConnMan.conn_pool_sem.acquire()

+        ConnMan.conn_pool[conn.id].append(conn)

+        ConnMan.conn_pool_sem.release()

+        debug("ConnMan.put(): connection put back to pool (%s#%d)" % (conn.id, conn.counter))

+

new file mode 100644

@@ -0,0 +1,53 @@

+## Amazon S3 manager

+## Author: Michal Ludvig <michal@logix.cz>

+##         http://www.logix.cz/michal

+## License: GPL Version 2

+

+from SortedDict import SortedDict

+import Utils

+

+class FileDict(SortedDict):

+    def __init__(self, mapping = {}, ignore_case = True, **kwargs):

+        SortedDict.__init__(self, mapping = mapping, ignore_case = ignore_case, **kwargs)

+        self.hardlinks = dict() # { dev: { inode : {'md5':, 'relative_files':}}}

+        self.by_md5 = dict() # {md5: set(relative_files)}

+

+    def record_md5(self, relative_file, md5):

+        if md5 not in self.by_md5:

+            self.by_md5[md5] = set()

+        self.by_md5[md5].add(relative_file)

+

+    def find_md5_one(self, md5):

+        try:

+            return list(self.by_md5.get(md5, set()))[0]

+        except:

+            return None

+

+    def get_md5(self, relative_file):

+        """returns md5 if it can, or raises IOError if file is unreadable"""

+        md5 = None

+        if 'md5' in self[relative_file]:

+            return self[relative_file]['md5']

+        md5 = self.get_hardlink_md5(relative_file)

+        if md5 is None:

+            md5 = Utils.hash_file_md5(self[relative_file]['full_name'])

+        self.record_md5(relative_file, md5)

+        self[relative_file]['md5'] = md5

+        return md5

+

+    def record_hardlink(self, relative_file, dev, inode, md5):

+        if dev not in self.hardlinks:

+            self.hardlinks[dev] = dict()

+        if inode not in self.hardlinks[dev]:

+            self.hardlinks[dev][inode] = dict(md5=md5, relative_files=set())

+        self.hardlinks[dev][inode]['relative_files'].add(relative_file)

+

+    def get_hardlink_md5(self, relative_file):

+        md5 = None

+        dev = self[relative_file]['dev']

+        inode = self[relative_file]['inode']

+        try:

+            md5 = self.hardlinks[dev][inode]['md5']

+        except:

+            pass

+        return md5

@@ -6,7 +6,7 @@

 from S3 import S3

 from Config import Config

 from S3Uri import S3Uri

-from SortedDict import SortedDict

+from FileDict import FileDict

 from Utils import *

 from Exceptions import ParameterError

 from HashCache import HashCache

@@ -58,7 +58,7 @@ def _fswalk_no_symlinks(path):

 def filter_exclude_include(src_list):

     info(u"Applying --exclude/--include")

     cfg = Config()

-    exclude_list = SortedDict(ignore_case = False)

+    exclude_list = FileDict(ignore_case = False)

     for file in src_list.keys():

         debug(u"CHECK: %s" % file)

         excluded = False

@@ -224,7 +224,7 @@ def fetch_local_list(args, recursive = None):

             info(u"No cache file found, creating it.")

     local_uris = []

-    local_list = SortedDict(ignore_case = False)

+    local_list = FileDict(ignore_case = False)

     single_file = False

     if type(args) not in (list, tuple):

@@ -284,7 +284,7 @@ def fetch_remote_list(args, require_attribs = False, recursive = None):

             rem_base = rem_base[:rem_base.rfind('/')+1]

             remote_uri = S3Uri("s3://%s/%s" % (remote_uri.bucket(), rem_base))

         rem_base_len = len(rem_base)

-        rem_list = SortedDict(ignore_case = False)

+        rem_list = FileDict(ignore_case = False)

         break_now = False

         for object in response['list']:

             if object['Key'] == rem_base_original and object['Key'][-1] != os.path.sep:

@@ -292,7 +292,7 @@ def fetch_remote_list(args, require_attribs = False, recursive = None):

                 key = os.path.basename(object['Key'])

                 object_uri_str = remote_uri_original.uri()

                 break_now = True

-                rem_list = SortedDict(ignore_case = False)   ## Remove whatever has already been put to rem_list

+                rem_list = FileDict(ignore_case = False)   ## Remove whatever has already been put to rem_list

             else:

                 key = object['Key'][rem_base_len:]      ## Beware - this may be '' if object['Key']==rem_base !!

                 object_uri_str = remote_uri.uri() + key

@@ -314,7 +314,7 @@ def fetch_remote_list(args, require_attribs = False, recursive = None):

     cfg = Config()

     remote_uris = []

-    remote_list = SortedDict(ignore_case = False)

+    remote_list = FileDict(ignore_case = False)

     if type(args) not in (list, tuple):

         args = [args]

@@ -436,7 +436,7 @@ def compare_filelists(src_list, dst_list, src_remote, dst_remote, delay_updates

     ## Items left on src_list will be transferred

     ## Items left on update_list will be transferred after src_list

     ## Items left on copy_pairs will be copied from dst1 to dst2

-    update_list = SortedDict(ignore_case = False)

+    update_list = FileDict(ignore_case = False)

     ## Items left on dst_list will be deleted

     copy_pairs = []

@@ -1,5 +1,5 @@

 package = "s3cmd"

-version = "1.5.0-alpha1"

+version = "1.5.0-alpha3"

 url = "http://s3tools.org"

 license = "GPL version 2"

 short_description = "Command line tool for managing Amazon S3 and CloudFront services"

@@ -27,6 +27,7 @@ from Config import Config

 from Exceptions import *

 from MultiPart import MultiPartUpload

 from S3Uri import S3Uri

+from ConnMan import ConnMan

 try:

     import magic, gzip

@@ -190,15 +191,6 @@ class S3(object):

     def __init__(self, config):

         self.config = config

-    def get_connection(self, bucket):

-        if self.config.proxy_host != "":

-            return httplib.HTTPConnection(self.config.proxy_host, self.config.proxy_port)

-        else:

-            if self.config.use_https:

-                return httplib.HTTPSConnection(self.get_hostname(bucket))

-            else:

-                return httplib.HTTPConnection(self.get_hostname(bucket))

-

     def get_hostname(self, bucket):

         if bucket and check_bucket_name_dns_conformity(bucket):

             if self.redir_map.has_key(bucket):

@@ -246,10 +238,9 @@ class S3(object):

         truncated = True

         list = []

         prefixes = []

-        conn = self.get_connection(bucket)

         while truncated:

-            response = self.bucket_list_noparse(conn, bucket, prefix, recursive, uri_params)

+            response = self.bucket_list_noparse(bucket, prefix, recursive, uri_params)

             current_list = _get_contents(response["data"])

             current_prefixes = _get_common_prefixes(response["data"])

             truncated = _list_truncated(response["data"])

@@ -263,19 +254,17 @@ class S3(object):

             list += current_list

             prefixes += current_prefixes

-        conn.close()

-

         response['list'] = list

         response['common_prefixes'] = prefixes

         return response

-    def bucket_list_noparse(self, connection, bucket, prefix = None, recursive = None, uri_params = {}):

+    def bucket_list_noparse(self, bucket, prefix = None, recursive = None, uri_params = {}):

         if prefix:

             uri_params['prefix'] = self.urlencode_string(prefix)

         if not self.config.recursive and not recursive:

             uri_params['delimiter'] = "/"

         request = self.create_request("BUCKET_LIST", bucket = bucket, **uri_params)

-        response = self.send_request(request, conn = connection)

+        response = self.send_request(request)

         #debug(response)

         return response

@@ -679,7 +668,7 @@ class S3(object):

         # Wait a few seconds. The more it fails the more we wait.

         return (self._max_retries - retries + 1) * 3

-    def send_request(self, request, body = None, retries = _max_retries, conn = None):

+    def send_request(self, request, body = None, retries = _max_retries):

         method_string, resource, headers = request.get_triplet()

         debug("Processing request, please wait...")

         if not headers.has_key('content-length'):

@@ -688,25 +677,20 @@ class S3(object):

             # "Stringify" all headers

             for header in headers.keys():

                 headers[header] = str(headers[header])

-            if conn is None:

-                debug("Establishing connection")

-                conn = self.get_connection(resource['bucket'])

-                close_conn = True

-            else:

-                debug("Using existing connection")

-                close_conn = False

+            conn = ConnMan.get(self.get_hostname(resource['bucket']))

             uri = self.format_uri(resource)

             debug("Sending request method_string=%r, uri=%r, headers=%r, body=(%i bytes)" % (method_string, uri, headers, len(body or "")))

-            conn.request(method_string, uri, body, headers)

+            conn.c.request(method_string, uri, body, headers)

             response = {}

-            http_response = conn.getresponse()

+            http_response = conn.c.getresponse()

             response["status"] = http_response.status

             response["reason"] = http_response.reason

             response["headers"] = convertTupleListToDict(http_response.getheaders())

             response["data"] =  http_response.read()

             debug("Response: " + str(response))

-            if close_conn is True:

-                conn.close()

+            ConnMan.put(conn)

+        except ParameterError, e:

+            raise

         except Exception, e:

             if retries:

                 warning("Retrying failed request: %s (%s)" % (resource['uri'], e))

@@ -749,12 +733,13 @@ class S3(object):

             info("Sending file '%s', please wait..." % file.name)

         timestamp_start = time.time()

         try:

-            conn = self.get_connection(resource['bucket'])

-            conn.connect()

-            conn.putrequest(method_string, self.format_uri(resource))

+            conn = ConnMan.get(self.get_hostname(resource['bucket']))

+            conn.c.putrequest(method_string, self.format_uri(resource))

             for header in headers.keys():

-                conn.putheader(header, str(headers[header]))

-            conn.endheaders()

+                conn.c.putheader(header, str(headers[header]))

+            conn.c.endheaders()

+        except ParameterError, e:

+            raise

         except Exception, e:

             if self.config.progress_meter:

                 progress.done("failed")

@@ -777,7 +762,7 @@ class S3(object):

                 else:

                     data = buffer

                 md5_hash.update(data)

-                conn.send(data)

+                conn.c.send(data)

                 if self.config.progress_meter:

                     progress.update(delta_position = len(data))

                 size_left -= len(data)

@@ -785,14 +770,16 @@ class S3(object):

                     time.sleep(throttle)

             md5_computed = md5_hash.hexdigest()

             response = {}

-            http_response = conn.getresponse()

+            http_response = conn.c.getresponse()

             response["status"] = http_response.status

             response["reason"] = http_response.reason

             response["headers"] = convertTupleListToDict(http_response.getheaders())

             response["data"] = http_response.read()

             response["size"] = size_total

-            conn.close()

+            ConnMan.put(conn)

             debug(u"Response: %s" % response)

+        except ParameterError, e:

+            raise

         except Exception, e:

             if self.config.progress_meter:

                 progress.done("failed")

@@ -814,7 +801,7 @@ class S3(object):

         response["speed"] = response["elapsed"] and float(response["size"]) / response["elapsed"] or float(-1)

         if self.config.progress_meter:

-            ## The above conn.close() takes some time -> update() progress meter

+            ## Finalising the upload takes some time -> update() progress meter

             ## to correct the average speed. Otherwise people will complain that

             ## 'progress' and response["speed"] are inconsistent ;-)

             progress.update()

@@ -889,21 +876,22 @@ class S3(object):

             info("Receiving file '%s', please wait..." % stream.name)

         timestamp_start = time.time()

         try:

-            conn = self.get_connection(resource['bucket'])

-            conn.connect()

-            conn.putrequest(method_string, self.format_uri(resource))

+            conn = ConnMan.get(self.get_hostname(resource['bucket']))

+            conn.c.putrequest(method_string, self.format_uri(resource))

             for header in headers.keys():

-                conn.putheader(header, str(headers[header]))

+                conn.c.putheader(header, str(headers[header]))

             if start_position > 0:

                 debug("Requesting Range: %d .. end" % start_position)

-                conn.putheader("Range", "bytes=%d-" % start_position)

-            conn.endheaders()

+                conn.c.putheader("Range", "bytes=%d-" % start_position)

+            conn.c.endheaders()

             response = {}

-            http_response = conn.getresponse()

+            http_response = conn.c.getresponse()

             response["status"] = http_response.status

             response["reason"] = http_response.reason

             response["headers"] = convertTupleListToDict(http_response.getheaders())

             debug("Response: %s" % response)

+        except ParameterError, e:

+            raise

         except Exception, e:

             if self.config.progress_meter:

                 progress.done("failed")

@@ -955,7 +943,7 @@ class S3(object):

                 ## Call progress meter from here...

                 if self.config.progress_meter:

                     progress.update(delta_position = len(data))

-            conn.close()

+            ConnMan.put(conn)

         except Exception, e:

             if self.config.progress_meter:

                 progress.done("failed")

@@ -27,8 +27,6 @@ class SortedDict(dict):

         """

         dict.__init__(self, mapping, **kwargs)

         self.ignore_case = ignore_case

-        self.hardlinks = dict() # { dev: { inode : {'md5':, 'relative_files':}}}

-        self.by_md5 = dict() # {md5: set(relative_files)}

     def keys(self):

         keys = dict.keys(self)

@@ -49,45 +47,6 @@ class SortedDict(dict):

         return SortedDictIterator(self, self.keys())

-    def record_md5(self, relative_file, md5):

-        if md5 not in self.by_md5:

-            self.by_md5[md5] = set()

-        self.by_md5[md5].add(relative_file)

-

-    def find_md5_one(self, md5):

-        try:

-            return list(self.by_md5.get(md5, set()))[0]

-        except:

-            return None

-

-    def get_md5(self, relative_file):

-        """returns md5 if it can, or raises IOError if file is unreadable"""

-        md5 = None

-        if 'md5' in self[relative_file]:

-            return self[relative_file]['md5']

-        md5 = self.get_hardlink_md5(relative_file)

-        if md5 is None:

-            md5 = Utils.hash_file_md5(self[relative_file]['full_name'])

-        self.record_md5(relative_file, md5)

-        self[relative_file]['md5'] = md5

-        return md5

-

-    def record_hardlink(self, relative_file, dev, inode, md5):

-        if dev not in self.hardlinks:

-            self.hardlinks[dev] = dict()

-        if inode not in self.hardlinks[dev]:

-            self.hardlinks[dev][inode] = dict(md5=md5, relative_files=set())

-        self.hardlinks[dev][inode]['relative_files'].add(relative_file)

-

-    def get_hardlink_md5(self, relative_file):

-        md5 = None

-        dev = self[relative_file]['dev']

-        inode = self[relative_file]['inode']

-        try:

-            md5 = self.hardlinks[dev][inode]['md5']

-        except:

-            pass

-        return md5

 if __name__ == "__main__":

     d = { 'AWS' : 1, 'Action' : 2, 'america' : 3, 'Auckland' : 4, 'America' : 5 }

@@ -656,10 +656,11 @@ def cmd_sync_remote2remote(args):

     print(u"Summary: %d source files to copy, %d files at destination to delete" % (src_count, dst_count))

-    if src_count > 0:

-        ### Populate 'remote_uri' only if we've got something to sync from src to dst

-        for key in src_list:

-            src_list[key]['target_uri'] = destination_base + key

+    ### Populate 'target_uri' only if we've got something to sync from src to dst

+    for key in src_list:

+        src_list[key]['target_uri'] = destination_base + key

+    for key in update_list:

+        update_list[key]['target_uri'] = destination_base + key

     if cfg.dry_run:

         for key in exclude_list:

@@ -745,6 +746,8 @@ def cmd_sync_remote2local(args):

     info(u"Summary: %d remote files to download, %d local files to delete, %d local files to hardlink" % (remote_count + update_count, local_count, copy_pairs_count))

     def _set_local_filename(remote_list, destination_base):

+        if len(remote_list) == 0:

+            return

         if not os.path.isdir(destination_base):

             ## We were either given a file name (existing or not) or want STDOUT

             if len(remote_list) > 1:

@@ -811,6 +814,15 @@ def cmd_sync_remote2local(args):

                     dst_stream.close()

                     # download completed, rename the file to destination

                     os.rename(chkptfname, dst_file)

+

+                    # set permissions on destination file

+                    original_umask = os.umask(0);

+                    os.umask(original_umask);

+                    mode = 0777 - original_umask;

+                    debug(u"mode=%s" % oct(mode))

+                    

+                    os.chmod(dst_file, mode);

+                    

                     debug(u"renamed chkptfname=%s to dst_file=%s" % (unicodise(chkptfname), unicodise(dst_file)))

                     if response['headers'].has_key('x-amz-meta-s3cmd-attrs') and cfg.preserve_attrs:

                         attrs = parse_attrs_header(response['headers']['x-amz-meta-s3cmd-attrs'])

@@ -822,7 +834,9 @@ def cmd_sync_remote2local(args):

                             os.utime(dst_file, (atime, mtime))

                         ## FIXME: uid/gid / uname/gname handling comes here! TODO

                 except OSError, e:

-                    try: dst_stream.close()

+                    try: 

+                        dst_stream.close() 

+                        os.remove(chkptfname)

                     except: pass

                     if e.errno == errno.EEXIST:

                         warning(u"%s exists - not overwriting" % (dst_file))

@@ -835,19 +849,25 @@ def cmd_sync_remote2local(args):

                         continue

                     raise e

                 except KeyboardInterrupt:

-                    try: dst_stream.close()

+                    try: 

+                        dst_stream.close()

+                        os.remove(chkptfname)

                     except: pass

                     warning(u"Exiting after keyboard interrupt")

                     return

                 except Exception, e:

-                    try: dst_stream.close()

+                    try: 

+                        dst_stream.close()

+                        os.remove(chkptfname)

                     except: pass

                     error(u"%s: %s" % (file, e))

                     continue

                 # We have to keep repeating this call because

                 # Python 2.4 doesn't support try/except/finally

                 # construction :-(

-                try: dst_stream.close()

+                try: 

+                    dst_stream.close()

+                    os.remove(chkptfname)

                 except: pass

             except S3DownloadError, e:

                 error(u"%s: download failed too many times. Skipping that file." % file)

@@ -893,7 +913,7 @@ def local_copy(copy_pairs, destination_base):

     # Do NOT hardlink local files by default, that'd be silly

     # For instance all empty files would become hardlinked together!

-    failed_copy_list = SortedDict()

+    failed_copy_list = FileDict()

     for (src_obj, dst1, relative_file) in copy_pairs:

         src_file = os.path.join(destination_base, dst1)

         dst_file = os.path.join(destination_base, relative_file)

@@ -1058,7 +1078,8 @@ def cmd_sync_local2remote(args):

             ## Make remote_key same as local_key for comparison if we're dealing with only one file

             remote_list_entry = remote_list[remote_list.keys()[0]]

             # Flush remote_list, by the way

-            remote_list = { local_list.keys()[0] : remote_list_entry }

+            remote_list = FileDict()

+            remote_list[local_list.keys()[0]] =  remote_list_entry

         local_list, remote_list, update_list, copy_pairs = compare_filelists(local_list, remote_list, src_remote = False, dst_remote = True, delay_updates = cfg.delay_updates)

@@ -1644,6 +1665,7 @@ def get_commands_list():

     {"cmd":"multipart", "label":"show multipart uploads", "param":"s3://BUCKET [Id]", "func":cmd_multipart, "argc":1},

     {"cmd":"abortmp",   "label":"abort a multipart upload", "param":"s3://BUCKET/OBJECT Id", "func":cmd_abort_multipart, "argc":2},

+

     {"cmd":"listmp",    "label":"list parts of a multipart upload", "param":"s3://BUCKET/OBJECT Id", "func":cmd_list_multipart, "argc":2},

     {"cmd":"accesslog", "label":"Enable/disable bucket access logging", "param":"s3://BUCKET", "func":cmd_accesslog, "argc":1},

@@ -1856,6 +1878,7 @@ def main():

     optparser.add_option(      "--version", dest="show_version", action="store_true", help="Show s3cmd version (%s) and exit." % (PkgInfo.version))

     optparser.add_option("-F", "--follow-symlinks", dest="follow_symlinks", action="store_true", default=False, help="Follow symbolic links as if they are regular files")

     optparser.add_option(      "--cache-file", dest="cache_file", action="store", default="",  metavar="FILE", help="Cache FILE containing local source MD5 values")

+    optparser.add_option("-q", "--quiet", dest="quiet", action="store_true", default=False, help="Silence output on stdout")

     optparser.set_usage(optparser.usage + " COMMAND [parameters]")

     optparser.set_description('S3cmd is a tool for managing objects in '+

@@ -1878,6 +1901,14 @@ def main():

         output(u"s3cmd version %s" % PkgInfo.version)

         sys.exit(0)

+    if options.quiet:

+        try:

+            f = open("/dev/null", "w")

+            sys.stdout.close()

+            sys.stdout = f

+        except IOError:

+            warning(u"Unable to open /dev/null: --quiet disabled.")

+

     ## Now finally parse the config file

     if not options.config:

         error(u"Can't find a config file. Please use --config option.")

@@ -2099,6 +2130,7 @@ if __name__ == '__main__':

         from S3.S3 import S3

         from S3.Config import Config

         from S3.SortedDict import SortedDict

+        from S3.FileDict import FileDict

         from S3.S3Uri import S3Uri

         from S3 import Utils

         from S3.Utils import *

@@ -57,8 +57,11 @@ Move object

 s3cmd \fBsetacl\fR \fIs3://BUCKET[/OBJECT]\fR

 Modify Access control list for Bucket or Files

 .TP

-s3cmd \fBsetpolicy\fR \fIs3://BUCKET POLICY_STRING\fR

-Set an access policy for a bucket

+s3cmd \fBsetpolicy\fR \fIFILE s3://BUCKET\fR

+Modify Bucket Policy

+.TP

+s3cmd \fBdelpolicy\fR \fIs3://BUCKET\fR

+Delete Bucket Policy

 .TP

 s3cmd \fBaccesslog\fR \fIs3://BUCKET\fR

 Enable/disable bucket access logging

@@ -318,13 +321,16 @@ Enable verbose output.

 Enable debug output.

 .TP

 \fB\-\-version\fR

-Show s3cmd version (1.5.0-alpha1) and exit.

+Show s3cmd version (1.5.0-alpha3) and exit.

 .TP

 \fB\-F\fR, \fB\-\-follow\-symlinks\fR

 Follow symbolic links as if they are regular files

 .TP

 \fB\-\-cache\-file\fR=FILE

 Cache FILE containing local source MD5 values

+.TP

+\fB\-q\fR, \fB\-\-quiet\fR

+Silence output on stdout

 .SH EXAMPLES