@@ -18,7 +18,7 @@ import sys

 import glob

 import copy

-__all__ = ["fetch_local_list", "fetch_remote_list", "compare_filelists", "filter_exclude_include", "parse_attrs_header"]

+__all__ = ["fetch_local_list", "fetch_remote_list", "compare_filelists", "filter_exclude_include"]

 def _fswalk_follow_symlinks(path):

     '''

@@ -307,12 +307,12 @@ def fetch_remote_list(args, require_attribs = False, recursive = None):

         'md5': response['headers']['etag'].strip('"\''),

         'timestamp' : dateRFC822toUnix(response['headers']['date'])

         })

-        # get md5 from header if it's present.  We would have set that during upload

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

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

-            if attrs.has_key('md5'):

-                remote_item.update({'md5': attrs['md5']})

-                debug(u"retreived md5=%s from headers" % (attrs['md5']))

+        try:

+            md5 = response['s3cmd-attrs']['md5']

+            remote_item.update({'md5': md5})

+            debug(u"retreived md5=%s from headers" % md5)

+        except KeyError:

+            pass

     def _get_filelist_remote(remote_uri, recursive = True):

         ## If remote_uri ends with '/' then all remote files will have

@@ -432,13 +432,6 @@ def fetch_remote_list(args, require_attribs = False, recursive = None):

                     remote_list.record_md5(key, md5)

     return remote_list

-def parse_attrs_header(attrs_header):

-    attrs = {}

-    for attr in attrs_header.split("/"):

-        key, val = attr.split(":")

-        attrs[key] = val

-    return attrs

-

 def compare_filelists(src_list, dst_list, src_remote, dst_remote, delay_updates = False):

     def __direction_str(is_remote):

@@ -669,6 +669,9 @@ class S3(object):

             response["reason"] = http_response.reason

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

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

+            if response["headers"].has_key("x-amz-meta-s3cmd-attrs"):

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

+                response["s3cmd-attrs"] = attrs

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

             ConnMan.put(conn)

         except ParameterError, e:

@@ -975,4 +978,10 @@ class S3(object):

         return response

 __all__.append("S3")

+def parse_attrs_header(attrs_header):

+    attrs = {}

+    for attr in attrs_header.split("/"):

+        key, val = attr.split(":")

+        attrs[key] = val

+    return attrs

 # vim:et:ts=4:sts=4:ai

@@ -155,12 +155,22 @@ def subcmd_bucket_list(s3, uri):

             "uri": uri.compose_uri(bucket, prefix["Prefix"])})

     for object in response["list"]:

+        md5 = object['ETag'].strip('"')

+        if cfg.list_md5:

+            if md5.find('-') >= 0: # need to get md5 from the object

+                object_uri = uri.compose_uri(bucket, object["Key"])

+                info_response = s3.object_info(S3Uri(object_uri))

+                try:

+                    md5 = info_response['s3cmd-attrs']['md5']

+                except KeyError:

+                    pass

+

         size, size_coeff = formatSize(object["Size"], Config().human_readable_sizes)

         output(format_string % {

             "timestamp": formatDateTime(object["LastModified"]),

             "size" : str(size),

             "coeff": size_coeff,

-            "md5" : object['ETag'].strip('"'),

+            "md5" : md5,

             "uri": uri.compose_uri(bucket, object["Key"]),

             })

@@ -319,6 +329,10 @@ def cmd_object_put(args):

         seq_label = "[%d of %d]" % (seq, local_count)

         if Config().encrypt:

             exitcode, full_name, extra_headers["x-amz-meta-s3tools-gpgenc"] = gpg_encrypt(full_name_orig)

+        if cfg.preserve_attrs or local_list[key]['size'] > (cfg.multipart_chunk_size_mb * 1024 * 1024):

+            attr_header = _build_attr_header(local_list, key)

+            debug(u"attr_header: %s" % attr_header)

+            extra_headers.update(attr_header)

         try:

             response = s3.object_put(full_name, uri_final, extra_headers, extra_label = seq_label)

         except S3UploadError, e:

@@ -606,7 +620,12 @@ def cmd_info(args):

                 output(u"   File size: %s" % info['headers']['content-length'])

                 output(u"   Last mod:  %s" % info['headers']['last-modified'])

                 output(u"   MIME type: %s" % info['headers']['content-type'])

-                output(u"   MD5 sum:   %s" % info['headers']['etag'].strip('"'))

+                md5 = info['headers']['etag'].strip('"')

+                try:

+                    md5 = info['s3cmd-attrs']['md5']

+                except KeyError:

+                    pass

+                output(u"   MD5 sum:   %s" % md5)

             else:

                 info = s3.bucket_info(uri)

                 output(u"%s (bucket):" % uri.uri())

@@ -863,8 +882,8 @@ def cmd_sync_remote2local(args):

                     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'])

+                    if response.has_key('s3cmd-attrs') and cfg.preserve_attrs:

+                        attrs = response['s3cmd-attrs']

                         if attrs.has_key('mode'):

                             os.chmod(dst_file, int(attrs['mode']))

                         if attrs.has_key('mtime') or attrs.has_key('atime'):

@@ -984,41 +1003,42 @@ def remote_copy(s3, copy_pairs, destination_base):

             raise

     return (len(copy_pairs), saved_bytes)

+def _build_attr_header(local_list, src):

+    import pwd, grp

+    attrs = {}

+    for attr in cfg.preserve_attrs_list:

+        if attr == 'uname':

+            try:

+                val = pwd.getpwuid(local_list[src]['uid']).pw_name

+            except KeyError:

+                attr = "uid"

+                val = local_list[src].get('uid')

+                warning(u"%s: Owner username not known. Storing UID=%d instead." % (src, val))

+        elif attr == 'gname':

+            try:

+                val = grp.getgrgid(local_list[src].get('gid')).gr_name

+            except KeyError:

+                attr = "gid"

+                val = local_list[src].get('gid')

+                warning(u"%s: Owner groupname not known. Storing GID=%d instead." % (src, val))

+        elif attr == 'md5':

+            try:

+                val = local_list.get_md5(src)

+            except IOError:

+                val = None

+        else:

+            val = getattr(local_list[src]['sr'], 'st_' + attr)

+        attrs[attr] = val

+

+    if 'md5' in attrs and attrs['md5'] is None:

+        del attrs['md5']

-def cmd_sync_local2remote(args):

-    def _build_attr_header(local_list, src):

-        import pwd, grp

-        attrs = {}

-        for attr in cfg.preserve_attrs_list:

-            if attr == 'uname':

-                try:

-                    val = pwd.getpwuid(local_list[src]['uid']).pw_name

-                except KeyError:

-                    attr = "uid"

-                    val = local_list[src].get('uid')

-                    warning(u"%s: Owner username not known. Storing UID=%d instead." % (src, val))

-            elif attr == 'gname':

-                try:

-                    val = grp.getgrgid(local_list[src].get('gid')).gr_name

-                except KeyError:

-                    attr = "gid"

-                    val = local_list[src].get('gid')

-                    warning(u"%s: Owner groupname not known. Storing GID=%d instead." % (src, val))

-            elif attr == 'md5':

-                try:

-                    val = local_list.get_md5(src)

-                except IOError:

-                    val = None

-            else:

-                val = getattr(local_list[src]['sr'], 'st_' + attr)

-            attrs[attr] = val

+    result = ""

+    for k in attrs: result += "%s:%s/" % (k, attrs[k])

+    return { 'x-amz-meta-s3cmd-attrs' : result[:-1] }

-        if 'md5' in attrs and attrs['md5'] is None:

-            del attrs['md5']

-        result = ""

-        for k in attrs: result += "%s:%s/" % (k, attrs[k])

-        return { 'x-amz-meta-s3cmd-attrs' : result[:-1] }

+def cmd_sync_local2remote(args):

     def _do_deletes(s3, remote_list):

         if cfg.max_delete > 0 and len(remote_list) > cfg.max_delete: