openstack/swift
Code Issues Proposed changes

in st, skips directory creation when streaming to standard out

Browse Source
This commit is contained in:
Greg Lange 2010-12-09 17:10:37 +00:00
parent 84aa5f0fc8
commit 371c610712
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bin/st
View File

@ -1020,8 +1020,9 @@ def st_download(options, args, print_queue, error_queue):
path = options.yes_all and join(container, obj) or obj path = options.yes_all and join(container, obj) or obj
if path[:1] in ('/', '\\'): if path[:1] in ('/', '\\'):
path = path[1:] path = path[1:]
make_dir = out_file != "-"
if content_type.split(';', 1)[0] == 'text/directory': if content_type.split(';', 1)[0] == 'text/directory':
if not isdir(path): if make_dir and not isdir(path):
mkdirs(path) mkdirs(path)
read_length = 0 read_length = 0
md5sum = md5() md5sum = md5()
@ -1030,7 +1031,7 @@ def st_download(options, args, print_queue, error_queue):
md5sum.update(chunk) md5sum.update(chunk)
else: else:
dirpath = dirname(path) dirpath = dirname(path)
if dirpath and not isdir(dirpath): if make_dir and dirpath and not isdir(dirpath):
mkdirs(dirpath) mkdirs(dirpath)
if out_file == "-": if out_file == "-":
fp = stdout fp = stdout