Permalink
Browse files

* s3cmd: Last-minute compatibility fixes for Python 2.4

git-svn-id: https://s3tools.svn.sourceforge.net/svnroot/s3tools/s3cmd/trunk@199 830e0280-6d2a-0410-9c65-932aecc39d9d
  • Loading branch information...
1 parent 3490bb4 commit 2dad9f8626d73a2042406fe8dcac69c353c1fd14 @mludvig mludvig committed Jun 23, 2008
Showing with 6 additions and 1 deletion.
  1. +1 −0 ChangeLog
  2. +5 −1 s3cmd
View
1 ChangeLog
@@ -11,6 +11,7 @@
2008-06-23 Michal Ludvig <michal@logix.cz>
+ * s3cmd: Last-minute compatibility fixes for Python 2.4
* s3cmd, s3cmd.1: --debug-exclude is an alias for --debug-syncmatch
* s3cmd: Don't require $HOME env variable to be set.
Fixes #2000133
View
6 s3cmd
@@ -554,7 +554,8 @@ def cmd_sync_local2remote(src, dst):
for k in attrs: result += "%s:%s/" % (k, attrs[k])
return { 'x-amz-meta-s3cmd-attrs' : result[:-1] }
- s3 = S3(Config())
+ cfg = Config()
+ s3 = S3(cfg)
src_uri = S3Uri(src)
dst_uri = S3Uri(dst)
@@ -1038,6 +1039,9 @@ if __name__ == '__main__':
main()
sys.exit(0)
+ except SystemExit, e:
+ sys.exit(e.code)
+
except Exception, e:
sys.stderr.write("""
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

0 comments on commit 2dad9f8

Please sign in to comment.