Revision 8fb0acd2

b/kamaki/cli/commands/pithos.py
1169 1169
                    rpath, f,
1170 1170
                    etag=self['etag'], withHashFile=self['use_hashes'],
1171 1171
                    **params)
1172
                if self['with_output'] or (
1173
                        self['json_output'] or self['output_format']):
1172
                if self['with_output'] or self['json_output']:
1174 1173
                    r['name'] = '%s: %s' % (self.client.container, rpath)
1175 1174
                    uploaded.append(r)
1176 1175
            else:
......
1189 1188
                        upload_cb=upload_cb,
1190 1189
                        container_info_cache=container_info_cache,
1191 1190
                        **params)
1192
                    if self['with_output'] or (
1193
                            self['json_output'] or self['output_format']):
1191
                    if self['with_output'] or self['json_output']:
1194 1192
                        r['name'] = '%s: %s' % (self.client.container, rpath)
1195 1193
                        uploaded.append(r)
1196 1194
                except Exception:

Also available in: Unified diff