# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1468308433 -10800
# Node ID d5e3ca4b609d4745df18975225932f1a57c1a676
# Parent  8ef792b573a92a29648b733d53af7c44fc1466e1
Improve error handling when e-mail sending fails.

diff -r 8ef792b573a9 -r d5e3ca4b609d multimerge.py
--- a/multimerge.py	Tue Jul 12 10:01:57 2016 +0300
+++ b/multimerge.py	Tue Jul 12 10:27:13 2016 +0300
@@ -63,8 +63,8 @@
             smtpH = smtplib.SMTP('localhost')
             smtpH.sendmail(cfg.email_sender, cfg.email_to, msg.as_string())
             smtpH.quit()
-        except:
-            gcm_print(u"FATAL: Oh crap, e-mail sending failed.")
+        except Exception as e:
+            gcm_print(u"FATAL: Oh crap, e-mail sending failed: {0}".format(str(e)))
     sys.exit(1)