Attachment 924253 Details for Bug 1126942 – Pete Zaitcev's hard work

[patch] Pete Zaitcev's hard work

x.diff (text/plain), 1.29 KB, created by Kodiak Firesmith on 2014-08-05 16:04:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kodiak Firesmith

Created: 2014-08-05 16:04:40 UTC

Size: 1.29 KB

patch

obsolete

>commit 6ef418996d7435977e7a858fe230cb46d5b91424
>Author: Pete Zaitcev <zaitcev@kotori.zaitcev.us>
>Date:   Tue Aug 5 00:03:58 2014 -0600
>
>    Fix KF traceback at pseudodir
>
>diff --git a/swiftclient/shell.py b/swiftclient/shell.py
>index ef153c7..dabb3c7 100755
>--- a/swiftclient/shell.py
>+++ b/swiftclient/shell.py
>@@ -24,7 +24,7 @@ from errno import EEXIST, ENOENT
> from hashlib import md5
> from optparse import OptionParser, SUPPRESS_HELP
> from os import environ, listdir, makedirs, utime, _exit as os_exit
>-from os.path import dirname, getmtime, getsize, isdir, join, \
>+from os.path import basename, dirname, getmtime, getsize, isdir, join, \
>     sep as os_path_sep
> from random import shuffle
> from sys import argv as sys_argv, exit, stderr, stdout
>@@ -403,7 +403,10 @@ def st_download(parser, args, thread_manager):
>                     elif out_file:
>                         fp = open(out_file, 'wb')
>                     else:
>-                        fp = open(path, 'wb')
>+                        if basename(path):
>+                            fp = open(path, 'wb')
>+                        else:
>+                            fp = open('/dev/null', 'wb')
>                 read_length = 0
>                 if 'x-object-manifest' not in headers and \
>                         'x-static-large-object' not in headers:

Actions: View | Diff

Attachments on bug 1126942: 924253