Skip to content

Commit

Permalink
Merge pull request s3tools#20 from pulseenergy/master
Browse files Browse the repository at this point in the history
Fixing KeyError when copying multiple keys (SourceForge bug 3091912)
  • Loading branch information
mludvig committed Jan 7, 2012
2 parents 16d5faf + af984ba commit f49ecb3
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions s3cmd
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/python

## Amazon S3 manager
## Author: Michal Ludvig <michal@logix.cz>
Expand Down Expand Up @@ -509,11 +509,11 @@ def subcmd_cp_mv(args, process_fce, action_str, message):
for key in remote_list:
remote_list[key]['dest_name'] = destination_base + key
else:
key = remote_list.keys()[0]
if destination_base.endswith("/"):
remote_list[key]['dest_name'] = destination_base + key
else:
remote_list[key]['dest_name'] = destination_base
for key in remote_list:
if destination_base.endswith("/"):
remote_list[key]['dest_name'] = destination_base + key
else:
remote_list[key]['dest_name'] = destination_base

if cfg.dry_run:
for key in exclude_list:
Expand Down

0 comments on commit f49ecb3

Please sign in to comment.