summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-05-21 04:17:52 +0000
committerGerrit Code Review <review@openstack.org>2013-05-21 04:17:52 +0000
commitfeec0c83acbb052dff54b214c737e693007eae1b (patch)
tree37714b52e628e06b510b94cf2ce3309153709209
parent7391fcc45e6852dd430748dd26c81eb495c11d32 (diff)
parentadebab739d0101d32d3e8f984a544742ab4bc456 (diff)
downloadpython-swiftclient-feec0c83acbb052dff54b214c737e693007eae1b.tar.gz
Merge "do not warn about etag for slo"
-rwxr-xr-xbin/swift6
1 files changed, 4 insertions, 2 deletions
diff --git a/bin/swift b/bin/swift
index 838163b..f43e5fd 100755
--- a/bin/swift
+++ b/bin/swift
@@ -398,7 +398,8 @@ def st_download(parser, args, print_queue, error_queue):
if make_dir and not isdir(path):
mkdirs(path)
read_length = 0
- if 'x-object-manifest' not in headers:
+ if 'x-object-manifest' not in headers and \
+ 'x-static-large-object' not in headers:
md5sum = md5()
for chunk in body:
read_length += len(chunk)
@@ -416,7 +417,8 @@ def st_download(parser, args, print_queue, error_queue):
else:
fp = open(path, 'wb')
read_length = 0
- if 'x-object-manifest' not in headers:
+ if 'x-object-manifest' not in headers and \
+ 'x-static-large-object' not in headers:
md5sum = md5()
for chunk in body:
if not options.no_download: