From 26b4a8e5a19fb98677bb0b47a995ac2796519686 Mon Sep 17 00:00:00 2001
From: Michal Ludvig <mludvig@logix.net.nz>
Date: Thu, 3 Jul 2008 12:24:15 +0000
Subject: [PATCH] * s3cmd: Print version info on 'unexpected error' output.

git-svn-id: https://s3tools.svn.sourceforge.net/svnroot/s3tools/s3cmd/trunk@205 830e0280-6d2a-0410-9c65-932aecc39d9d
---
 ChangeLog | 4 ++++
 s3cmd     | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 168d5cad0..62a1f19a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-07-03  Michal Ludvig  <michal@logix.cz>
+
+	* s3cmd: Print version info on 'unexpected error' output.
+
 2008-06-30  Michal Ludvig  <michal@logix.cz>
 
 	* S3/S3.py: Re-upload when Amazon doesn't send ETag
diff --git a/s3cmd b/s3cmd
index e303d40a0..9e875f3a7 100755
--- a/s3cmd
+++ b/s3cmd
@@ -1051,6 +1051,9 @@ if __name__ == '__main__':
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 """)
+		sys.stderr.write("S3cmd:  %s\n" % PkgInfo.version)
+		sys.stderr.write("Python: %s\n" % sys.version.replace('\n', ' '))
+		sys.stderr.write("\n")
 		sys.stderr.write(traceback.format_exc(sys.exc_info())+"\n")
 		sys.stderr.write("""
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!