summary refs log tree commit diff stats
path: root/ranger
diff options
context:
space:
mode:
authorhut <hut@lavabit.com>2010-05-13 15:06:24 +0200
committerhut <hut@lavabit.com>2010-05-13 15:06:24 +0200
commit1903181524726664744f807d909ddc7687f8c0cf (patch)
treec56afce98e1ec26f70cd86f8ee0ed9b1f6c280b3 /ranger
parentff86460b721ce3398096473b75593a688e2e0f5d (diff)
downloadranger-1903181524726664744f807d909ddc7687f8c0cf.tar.gz
main: more user friendly crash messages
Diffstat (limited to 'ranger')
-rw-r--r--ranger/__main__.py29
1 files changed, 23 insertions, 6 deletions
diff --git a/ranger/__main__.py b/ranger/__main__.py
index 887f8e28..3bb857c3 100644
--- a/ranger/__main__.py
+++ b/ranger/__main__.py
@@ -154,13 +154,16 @@ def main():
 		sys.exit(1)
 
 	# Ensure that a utf8 locale is set.
-	if getdefaultlocale()[1] not in ('utf8', 'UTF-8'):
-		for locale in ('en_US.utf8', 'en_US.UTF-8'):
-			try: setlocale(LC_ALL, locale)
-			except: pass
-			else: break
+	try:
+		if getdefaultlocale()[1] not in ('utf8', 'UTF-8'):
+			for locale in ('en_US.utf8', 'en_US.UTF-8'):
+				try: setlocale(LC_ALL, locale)
+				except: pass
+				else: break
+			else: setlocale(LC_ALL, '')
 		else: setlocale(LC_ALL, '')
-	else: setlocale(LC_ALL, '')
+	except:
+		print("Warning: Unable to set locale.  Expect encoding problems.")
 
 	arg = parse_arguments()
 	ranger.arg = arg
@@ -187,6 +190,7 @@ def main():
 	else:
 		path = '.'
 
+	crash_exception = None
 	try:
 		# Initialize objects
 		EnvironmentAware._assign(Environment(path))
@@ -199,12 +203,25 @@ def main():
 		fm.initialize()
 		fm.ui.initialize()
 		fm.loop()
+	except Exception as e:
+		crash_exception = e
+		if not (arg.debug or arg.clean):
+			import traceback
+			dumpname = os.path.join(arg.confdir, 'traceback')
+			traceback.print_exc(file=open(dumpname, 'w'))
 	finally:
 		# Finish, clean up
 		try:
 			fm.ui.destroy()
 		except (AttributeError, NameError):
 			pass
+		if crash_exception:
+			print("Fatal: " + str(crash_exception))
+			if arg.debug or arg.clean:
+				raise crash_exception
+			else:
+				print("A traceback has been saved to " + dumpname)
+				print("Please include it in a bugreport.")
 
 
 if __name__ == '__main__':
> 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282