Browse code

Fix unicode issue in report in the case of an error

Florent Viard authored on 2017/10/11 06:06:14
Showing 1 changed files
... ...
@@ -3024,7 +3024,10 @@ def report_exception(e, msg=u''):
3024 3024
         except NameError:
3025 3025
             sys.stderr.write(u"S3cmd:   unknown version. Module import problem?\n")
3026 3026
         sys.stderr.write(u"python:   %s\n" % sys.version)
3027
-        sys.stderr.write(u"environment LANG=%s\n" % unicodise_s(os.getenv("LANG"), 'ascii'))
3027
+        try:
3028
+            sys.stderr.write(u"environment LANG=%s\n" % unicodise_s(os.getenv("LANG"), 'ascii'))
3029
+        except NameError:
3030
+            sys.stderr.write(u"environment LANG=%s\n" % os.getenv("LANG"))
3028 3031
         sys.stderr.write(u"\n")
3029 3032
         if type(tb) == unicode:
3030 3033
             sys.stderr.write(tb)