Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
itminedu
kamaki
Commits
8fb0acd2
Commit
8fb0acd2
authored
Oct 02, 2013
by
Stavros Sachtouris
Browse files
Fix error with wrong argument in file upload
parent
e372efc7
Changes
1
Show whitespace changes
Inline
Side-by-side
kamaki/cli/commands/pithos.py
View file @
8fb0acd2
...
@@ -1169,8 +1169,7 @@ class file_upload(_file_container_command, _optional_output_cmd):
...
@@ -1169,8 +1169,7 @@ class file_upload(_file_container_command, _optional_output_cmd):
rpath
,
f
,
rpath
,
f
,
etag
=
self
[
'etag'
],
withHashFile
=
self
[
'use_hashes'
],
etag
=
self
[
'etag'
],
withHashFile
=
self
[
'use_hashes'
],
**
params
)
**
params
)
if
self
[
'with_output'
]
or
(
if
self
[
'with_output'
]
or
self
[
'json_output'
]:
self
[
'json_output'
]
or
self
[
'output_format'
]):
r
[
'name'
]
=
'%s: %s'
%
(
self
.
client
.
container
,
rpath
)
r
[
'name'
]
=
'%s: %s'
%
(
self
.
client
.
container
,
rpath
)
uploaded
.
append
(
r
)
uploaded
.
append
(
r
)
else
:
else
:
...
@@ -1189,8 +1188,7 @@ class file_upload(_file_container_command, _optional_output_cmd):
...
@@ -1189,8 +1188,7 @@ class file_upload(_file_container_command, _optional_output_cmd):
upload_cb
=
upload_cb
,
upload_cb
=
upload_cb
,
container_info_cache
=
container_info_cache
,
container_info_cache
=
container_info_cache
,
**
params
)
**
params
)
if
self
[
'with_output'
]
or
(
if
self
[
'with_output'
]
or
self
[
'json_output'
]:
self
[
'json_output'
]
or
self
[
'output_format'
]):
r
[
'name'
]
=
'%s: %s'
%
(
self
.
client
.
container
,
rpath
)
r
[
'name'
]
=
'%s: %s'
%
(
self
.
client
.
container
,
rpath
)
uploaded
.
append
(
r
)
uploaded
.
append
(
r
)
except
Exception
:
except
Exception
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment