Attachment #123517 for bug #183808




		try:
			if int(mymailport) > 100000:
				myconn = smtplib.SMTP(mymailhost, int(mymailport) - 100000)
				myconn.ehlo()
				myconn.starttls()
				myconn.ehlo()
			else:
				myconn = smtplib.SMTP(mymailhost, mymailport)
			if mymailuser != "" and mymailpasswd != "":

		except smtplib.SMTPException, e:
			raise portage_exception.PortageException("!!! An error occured while trying to send logmail:\n"+str(e))
		except socket.error, e:
			if e[0] != 8:
				raise portage_exception.PortageException("!!! A network error occured while trying to send logmail:\n"+str(e)+"\nSure you configured PORTAGE_ELOG_MAILURI correctly?")
	return
	

Return to bug 183808

Lines 74-80 Link Here

(-)portage-2.1.2/pym/portage_mail.py (-1 / +4 lines)
74	try:	74	try:
75	if int(mymailport) > 100000:	75	if int(mymailport) > 100000:
76	myconn = smtplib.SMTP(mymailhost, int(mymailport) - 100000)	76	myconn = smtplib.SMTP(mymailhost, int(mymailport) - 100000)
		77	myconn.ehlo()
77	myconn.starttls()	78	myconn.starttls()
		79	myconn.ehlo()
78	else:	80	else:
79	myconn = smtplib.SMTP(mymailhost, mymailport)	81	myconn = smtplib.SMTP(mymailhost, mymailport)
80	if mymailuser != "" and mymailpasswd != "":	82	if mymailuser != "" and mymailpasswd != "":
Lines 84-89 Link Here
84	except smtplib.SMTPException, e:	86	except smtplib.SMTPException, e:
85	raise portage_exception.PortageException("!!! An error occured while trying to send logmail:\n"+str(e))	87	raise portage_exception.PortageException("!!! An error occured while trying to send logmail:\n"+str(e))
86	except socket.error, e:	88	except socket.error, e:
87	raise portage_exception.PortageException("!!! A network error occured while trying to send logmail:\n"+str(e)+"\nSure you configured PORTAGE_ELOG_MAILURI correctly?")	89	if e[0] != 8:
		90	raise portage_exception.PortageException("!!! A network error occured while trying to send logmail:\n"+str(e)+"\nSure you configured PORTAGE_ELOG_MAILURI correctly?")
88	return	91	return
89		92