# HG changeset patch # User Matti Hamalainen # Date 1478506486 -7200 # Node ID bb8b455218ecd51f10fa24b2ea31c4924247323c # Parent 977ecff4bd7dbff3021fb6e8e683129b9cee7e9c Improve comments. diff -r 977ecff4bd7d -r bb8b455218ec multimerge.py --- a/multimerge.py Mon Nov 07 09:10:29 2016 +0200 +++ b/multimerge.py Mon Nov 07 10:14:46 2016 +0200 @@ -75,6 +75,7 @@ try: # Act based on email mode if cfg.email == "smtp": + # Connect via SMTP gcm_print("Using SMTP server {0}, login {1}".format(cfg.email_smtp_server, cfg.email_smtp_user)) server = smtplib.SMTP(cfg.email_smtp_server) if gcm_check_debug(4): @@ -87,6 +88,7 @@ server.sendmail(cfg.email_sender, cfg.email_to, msg.as_string()) server.quit() elif cfg.email == "sendmail": + # Use local sendmail gcm_print("Using sendmail {0}".format(cfg.email_sendmail)) p = Popen([cfg.email_sendmail, "-t", "-oi"], stdin=PIPE) p.communicate(msg.as_string()) @@ -484,7 +486,7 @@ if len(cfg.src_regmap) != cfg.src_regmap_len: gcm_fatal(u"Setting src_regmap list must be {0} items.".format(cfg.src_regmap_len)) else: - # Force to integers + # Force convert values to integers try: cfg.src_regmap = [int(x) for x in cfg.src_regmap] except Exception as e: