[svn] r4785 - trunk/tools/yam

[packagers at lists.rpmforge.net]

Author: dag
Date: 2006-10-01 15:44:48 +0200 (Sun, 01 Oct 2006)
New Revision: 4785

Modified:
   trunk/tools/yam/yam
Log:
Small improvements to mail output.

Modified: trunk/tools/yam/yam
===================================================================
--- trunk/tools/yam/yam	2006-10-01 12:29:39 UTC (rev 4784)
+++ trunk/tools/yam/yam	2006-10-01 13:44:48 UTC (rev 4785)
@@ -1302,8 +1302,8 @@
 	except xmlrpclib.Fault, f:
 		raise(YamMirrorException('Problem setting up XML communication for channel %s.\n%s' % (label, f.faultString)))
 		return
-	except up2dateErrors.ServerCapabilityError, f:
-		raise(YamMirrorException('Problem negotiating capabilities for channel %s.\n%s' % (label, f.faultString)))
+	except up2dateErrors.ServerCapabilityError, e:
+		raise(YamMirrorException('Problem negotiating capabilities for channel %s.\n%s' % (label, e)))
 		return
 	try:
 		if cf.rhndownloadall == True:
@@ -1402,7 +1402,7 @@
 		import smtplib
 		smtp = smtplib.SMTP(cf.smtpserver)
 #		server.set_debuglevel(1)
-		msg = 'Subject: [yam] %s\n\nCurrent time:\n%s\nSystem information:\n%s\nUptime:\n%s\nCurrently logged on users:\n%s\n%s\n%s' % (subject, os.popen('date').read(), os.popen('uname -a').read(), os.popen('uptime').read(), os.popen('who').read(), subject, msg)
+		msg = 'Subject: [yam] %s\n\n%s' % (subject, msg)
 		for email in cf.mailto.split():
 			smtp.sendmail('yam@%s' % os.uname()[1], email, 'To: %s\n%s' % (email, msg))
 		smtp.quit()
@@ -1461,7 +1461,7 @@
 
 	sumnew = 0
 	sumremoved = 0
-	msg = ''
+	msg = 'The following changes to Yam\'s repositories on %s have been made:' % os.uname()[1]
 
 	### Mounting and mirroring available distributions/repositories
 	for dist in dists: